merge of commit 643011 from 1.1 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@680370 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 79 insertions, 73 deletions

diff --git a/java/sdo/sdo-api/pom.xml b/java/sdo/sdo-api/pom.xml
index e3249d95a9..450bfa4b19 100644
--- a/java/sdo/sdo-api/pom.xml
+++ b/java/sdo/sdo-api/pom.xml
@@ -95,13 +95,19 @@
                     <target>1.4</target>
                 </configuration>
             </plugin>
+
             <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
+               <artifactId>maven-jar-plugin</artifactId>
+               <configuration>
+                  <archive>
+                     <manifestEntries>
+                        <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                        <Implementation-Version>1.1-incubating</Implementation-Version>
+                        <X-Compile-Source-JDK>1.4</X-Compile-Source-JDK>
+                        <X-Compile-Target-JDK>1.4</X-Compile-Target-JDK>
+                     </manifestEntries>
+                  </archive>
+               </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
diff --git a/java/sdo/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java b/java/sdo/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
index 058393f727..143b29de17 100644
--- a/java/sdo/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
+++ b/java/sdo/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
@@ -1,67 +1,67 @@
-/**

- * <copyright>

- *

- * Service Data Objects

- * Version 2.1.0

- * Licensed Materials

- *

- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 

- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 

- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 

- * 2005, 2006. All rights reserved.

- *

- * </copyright>

- * 

- */

-

-package commonj.sdo.helper;

-

-/**

- * This interface represents a helper execution context.

- * The set of helpers returned by the methods in this interface have visibility

- * to the same SDO metadata, that is, they execute in the same "scope".

- */

-public interface HelperContext

-{

-  /**

-   * Gets the CopyHelper to use in this context.

-   * @return a CopyHelper object

-   */

-  CopyHelper getCopyHelper();

-

-  /**

-   * Gets the DataFactory to use in this context.

-   * @return a DataFactory object

-   */

-  DataFactory getDataFactory();

-

-  /**

-   * Gets the DataHelper to use in this context.

-   * @return a DataHelper object

-   */

-  DataHelper getDataHelper();

-

-  /**

-   * Gets the EqualityHelper to use in this context.

-   * @return an EqualityHelper object

-   */

-  EqualityHelper getEqualityHelper();

-  

-  /**

-   * Gets the TypeHelper to use in this context.

-   * @return a TypeHelper object

-   */

-  TypeHelper getTypeHelper();

-

-  /**

-   * Gets the XMLHelper to use in this context.

-   * @return an XMLHelper object

-   */

-  XMLHelper getXMLHelper();

-  

-  /**

-   * Gets the XSDHelper to use in this context.

-   * @return an XSDHelper object

-   */

-  XSDHelper getXSDHelper();

-}

+/**
+ * <copyright>
+ *
+ * Service Data Objects
+ * Version 2.1.0
+ * Licensed Materials
+ *
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
+ * 2005, 2006. All rights reserved.
+ *
+ * </copyright>
+ * 
+ */
+
+package commonj.sdo.helper;
+
+/**
+ * This interface represents a helper execution context.
+ * The set of helpers returned by the methods in this interface have visibility
+ * to the same SDO metadata, that is, they execute in the same "scope".
+ */
+public interface HelperContext
+{
+  /**
+   * Gets the CopyHelper to use in this context.
+   * @return a CopyHelper object
+   */
+  CopyHelper getCopyHelper();
+
+  /**
+   * Gets the DataFactory to use in this context.
+   * @return a DataFactory object
+   */
+  DataFactory getDataFactory();
+
+  /**
+   * Gets the DataHelper to use in this context.
+   * @return a DataHelper object
+   */
+  DataHelper getDataHelper();
+
+  /**
+   * Gets the EqualityHelper to use in this context.
+   * @return an EqualityHelper object
+   */
+  EqualityHelper getEqualityHelper();
+  
+  /**
+   * Gets the TypeHelper to use in this context.
+   * @return a TypeHelper object
+   */
+  TypeHelper getTypeHelper();
+
+  /**
+   * Gets the XMLHelper to use in this context.
+   * @return an XMLHelper object
+   */
+  XMLHelper getXMLHelper();
+  
+  /**
+   * Gets the XSDHelper to use in this context.
+   * @return an XSDHelper object
+   */
+  XSDHelper getXSDHelper();
+}