[eclipselink-dev] Transaction for 336179 available. please review.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[eclipselink-dev] Transaction for 336179 available. please review.

From: Eric Gwin <eric.gwin@xxxxxxxxxx>
Date: Wed, 09 Feb 2011 14:27:54 -0500
Delivered-to: eclipselink-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/eclipselink-dev>
List-help: <mailto:eclipselink-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/eclipselink-dev>, <mailto:eclipselink-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/eclipselink-dev>, <mailto:eclipselink-dev-request@eclipse.org?subject=unsubscribe>
Organization: Oracle Corporation
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.8) Gecko/20100802 Lightning/1.0b2 OracleBeehiveExtension/1.0.0.2-OracleInternal ObetStats/LAFCATCAF_1294839879169-914923201 Thunderbird/3.1.2

Attached is the patch file I created. copied resources and added directories don't show. I'm not planning on deleting the old xsds yet. SVN tends to work better with a copy, and then a delete in a separate transaction, rather than using the move (which does both at the same time).

Let me know if you have any concerns. I'd like to merge tonight, but can hold off until after the meeting tomorrow.

-Eric

On 2/9/2011 10:30 AM, Eric Gwin wrote:

To recap, the current plan under consideration is:

- move core XSDs to org.eclipse.persistence
- move the jpa XSD (eclipselink_orm_2_2.xsd) from core to jpa under org.eclipse.persistence.jpa
- move moxy XSDs to org.eclipse.persistence.jaxb
- move dbws XSDs to org.eclipse.persistence.dbws
- move builder XSDs to org.eclipse.persistence.tools.dbws (o.e.p.dbws.builder is not an existent package).

(the fragments and sdo do not have any).

note: all XSDs are currently being packaged under xsd with the exception of the ones currently in org.eclipse.persistence.jpa, so there IS a package splitting issue currently. Which is the reason for the discussion.

Feel free to comment in https://bugs.eclipse.org/bugs/show_bug.cgi?id=336179 if you'd prefer, the above is being added to the bug.

--
-Eric

Eric Gwin | Senior Software Developer
Phone: +613 288 4622 | | Fax: +613 2382818 | | Mobile: +613 8582347
Oracle Java Server Technologies
ORACLE Canada | 45 O'Connor St., Ottawa, Ontario | K1P 6L2
Oracle is committed to developing practices and products that help protect the environment
_______________________________________________
eclipselink-dev mailing list
eclipselink-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/eclipselink-dev

--
-Eric

Eric Gwin | Senior Software Developer
Phone: +613 288 4622 | | Fax: +613 2382818 | | Mobile: +613 8582347
Oracle Java Server Technologies
ORACLE Canada | 45 O'Connor St., Ottawa, Ontario | K1P 6L2
Oracle is committed to developing practices and products that help protect the environment

Index: build.properties
===================================================================
--- build.properties	(revision 8947)
+++ build.properties	(working copy)
@@ -53,7 +53,7 @@
 eclipselink.core=${eclipselink.core.base}/org.eclipse.persistence.core
 eclipselink.core.bin=${eclipselink.core.base}/bin
 eclipselink.core.test=${eclipselink.core.base}/eclipselink.core.test
-eclipselink.core.xsds=${eclipselink.core}/resource/xsd
+eclipselink.core.xsds=${eclipselink.core}/resource/org/eclipse/persistence
 eclipselink.core.plugins=${eclipselink.core.base}/${plugins.dir}
 eclipselink.core.depend=${activation.jar},javax.resource_1.5.0.jar,javax.ejb_3.0.0.jar,javax.jms_1.1.0.jar,${stax_api.jar},javax.transaction_1.1.0.v201002051055.jar,${mail.jar}
 
@@ -64,7 +64,7 @@
 
 eclipselink.dbws=${eclipselink.dbws.base}/org.eclipse.persistence.dbws
 eclipselink.dbws.test=${eclipselink.dbws.base}/eclipselink.dbws.test
-eclipselink.dbws.xsds=${eclipselink.dbws}/resource/xsd
+eclipselink.dbws.xsds=${eclipselink.dbws}/resource/org/eclipse/persistence/dbws
 eclipselink.dbws.plugins=${eclipselink.moxy.base}/${plugins.dir}
 
 eclipselink.jpa=${eclipselink.jpa.base}/org.eclipse.persistence.jpa
@@ -87,7 +87,7 @@
 eclipselink.moxy.dynamic=${eclipselink.moxy.base}/org.eclipse.persistence.moxy.dynamic
 eclipselink.moxy.test=${eclipselink.moxy.base}/eclipselink.moxy.test
 eclipselink.moxy.plugins=${eclipselink.moxy.base}/${plugins.dir}
-eclipselink.moxy.xsds=${eclipselink.moxy}/resource/xsd
+eclipselink.moxy.xsds=${eclipselink.moxy}/resource/org/eclipse/persistence/jaxb
 
 eclipselink.util.moxy=${eclipselink.util.base}/eclipselink.utils.jaxb
 
Index: dbws/org.eclipse.persistence.dbws/build.xml
===================================================================
--- dbws/org.eclipse.persistence.dbws/build.xml	(revision 8947)
+++ dbws/org.eclipse.persistence.dbws/build.xml	(working copy)
@@ -203,7 +203,7 @@
                 <include name="org/eclipse/persistence/**/*.class"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
         </jar>
         <jar jarfile="${dbws.2.common.plugins.dir}/${ant.project.name}.source_${version.string}.jar">
@@ -228,7 +228,7 @@
                 <include name="org/eclipse/persistence/**/*.java"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
         </jar>
     </target>
@@ -265,7 +265,7 @@
                 <include name="org/eclipse/persistence/**/*.java"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
         </jar>
     </target>
Index: foundation/org.eclipse.persistence.core/build.xml
===================================================================
--- foundation/org.eclipse.persistence.core/build.xml	(revision 8949)
+++ foundation/org.eclipse.persistence.core/build.xml	(working copy)
@@ -243,7 +243,7 @@
                 <include name="org/eclipse/persistence/**/*.class"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
                 <include name="org/eclipse/persistence/internal/helper/VendorNameToPlatformMapping.properties"/>
             </fileset>
         </jar>
@@ -273,7 +273,7 @@
                 <exclude name="org/eclipse/persistence/Version.java"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
                 <include name="org/eclipse/persistence/internal/helper/VendorNameToPlatformMapping.properties"/>
             </fileset>
         </jar>
@@ -316,7 +316,7 @@
                 <exclude name="org/eclipse/persistence/Version.java"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
                 <include name="org/eclipse/persistence/internal/helper/VendorNameToPlatformMapping.properties"/>
             </fileset>
         </jar>
Index: foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/XMLProjectReader.java
===================================================================
--- foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/XMLProjectReader.java	(revision 8949)
+++ foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/XMLProjectReader.java	(working copy)
@@ -60,7 +60,7 @@
 
     /** Cache the creation and initialization of the EclipseLink XML mapping project. */
     protected static Project project;
-    public static final String SCHEMA_DIR = "xsd/";
+    public static final String SCHEMA_DIR = "org/eclipse/persistence/";
     public static final String OPM_SCHEMA = "object-persistence_1_0.xsd";
     public static final String ECLIPSELINK_SCHEMA = "eclipselink_persistence_map_2.0.xsd";
     public static final String ECLIPSELINK_1_0_SCHEMA = "eclipselink_persistence_map_1.0.xsd";    
Index: foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/XMLSessionConfigLoader.java
===================================================================
--- foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/XMLSessionConfigLoader.java	(revision 8949)
+++ foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sessions/factories/XMLSessionConfigLoader.java	(working copy)
@@ -79,7 +79,7 @@
     /** Used to store the entity resolver to validate the XML schema when parsing. */
     protected PersistenceEntityResolver entityResolver;
 
-    public static final String ECLIPSELINK_SESSIONS_SCHEMA = "xsd/eclipselink_sessions_2.1.xsd";
+    public static final String ECLIPSELINK_SESSIONS_SCHEMA = "org/eclipse/persistence/eclipselink_sessions_2.1.xsd";
     protected static final String DEFAULT_RESOURCE_NAME = "sessions.xml";
     protected static final String DEFAULT_RESOURCE_NAME_IN_META_INF = "META-INF/sessions.xml";
 
Index: jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsReader.java
===================================================================
--- jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsReader.java	(revision 8947)
+++ jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsReader.java	(working copy)
@@ -56,7 +56,7 @@
     public static final String ORM_1_0_NAMESPACE = "http://java.sun.com/xml/ns/persistence/orm";;
     public static final String ORM_2_0_XSD = "org/eclipse/persistence/jpa/orm_2_0.xsd";
     public static final String ORM_2_0_NAMESPACE = "http://java.sun.com/xml/ns/persistence/orm";;
-    public static final String ECLIPSELINK_ORM_XSD = "xsd/eclipselink_orm_2_2.xsd";
+    public static final String ECLIPSELINK_ORM_XSD = "org/eclipse/persistence/jpa/eclipselink_orm_2_2.xsd";
     public static final String ECLIPSELINK_ORM_NAMESPACE = "http://www.eclipse.org/eclipselink/xsds/persistence/orm";;
     
     private static XMLContext m_orm1_0Project;
Index: moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java
===================================================================
--- moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java	(revision 8947)
+++ moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java	(working copy)
@@ -562,7 +562,7 @@
         try {
             InputStream bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("eclipselink_oxm_2_2.xsd");
             if (bindingsFileXSDInputStream == null){
-                bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("xsd/eclipselink_oxm_2_2.xsd");
+                bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("org/eclipse/persistence/jaxb/eclipselink_oxm_2_2.xsd");
             }
             if (bindingsFileXSDInputStream == null){
                 fail("ERROR LOADING eclipselink_oxm_2_2.xsd");
Index: moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
===================================================================
--- moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java	(revision 8947)
+++ moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java	(working copy)
@@ -90,7 +90,7 @@
 
         InputStream bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("eclipselink_oxm_2_1.xsd");
         if(bindingsFileXSDInputStream == null){
-            bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("xsd/eclipselink_oxm_2_1.xsd");
+            bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("org/eclipse/persistence/jaxb/eclipselink_oxm_2_1.xsd");
         }
         if(bindingsFileXSDInputStream == null){
             fail("ERROR LOADING eclipselink_oxm_2_1.xsd");
@@ -620,7 +620,7 @@
         try {
             InputStream bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("eclipselink_oxm_2_2.xsd");
             if (bindingsFileXSDInputStream == null){
-                bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("xsd/eclipselink_oxm_2_2.xsd");
+                bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("org/eclipse/persistence/jaxb/eclipselink_oxm_2_2.xsd");
             }
             if (bindingsFileXSDInputStream == null){
                 fail("ERROR LOADING eclipselink_oxm_2_2.xsd");
Index: moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
===================================================================
--- moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java	(revision 8947)
+++ moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java	(working copy)
@@ -88,7 +88,7 @@
 	    
 	    InputStream bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("eclipselink_oxm_2_1.xsd");
         if(bindingsFileXSDInputStream == null){
-        	bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("xsd/eclipselink_oxm_2_1.xsd");
+        	bindingsFileXSDInputStream = getClass().getClassLoader().getResourceAsStream("org/eclipse/persistence/jaxb/eclipselink_oxm_2_1.xsd");
         }
         if(bindingsFileXSDInputStream == null){
         	fail("ERROR LOADING eclipselink_oxm_2_1.xsd");
Index: moxy/org.eclipse.persistence.moxy/build.xml
===================================================================
--- moxy/org.eclipse.persistence.moxy/build.xml	(revision 8947)
+++ moxy/org.eclipse.persistence.moxy/build.xml	(working copy)
@@ -204,7 +204,7 @@
             </fileset>
             <fileset dir="${resource.dir}">
                 <include name="META-INF/services/*"/>
-                <include name="xsd/*"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
         </jar>
         <jar jarfile="${moxy.2.common.plugins.dir}/${ant.project.name}.source_${version.string}.jar">
@@ -228,8 +228,8 @@
             <fileset dir="${src.dir}">
                 <include name="org/eclipse/persistence/**/*.java"/>
             </fileset>
-            <fileset dir="${resource.dir}/xsd">
-                <include name="*"/>
+            <fileset dir="${resource.dir}">
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
         </jar>
     </target>
@@ -265,8 +265,8 @@
             <fileset dir="${src.dir}">
                 <include name="org/eclipse/persistence/**/*.java"/>
             </fileset>
-            <fileset dir="${resource.dir}/xsd">
-                <include name="*"/>
+            <fileset dir="${resource.dir}">
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
         </jar>
     </target>
Index: moxy/org.eclipse.persistence.moxy/org.eclipse.persistence.moxy.bnd
===================================================================
--- moxy/org.eclipse.persistence.moxy/org.eclipse.persistence.moxy.bnd	(revision 8947)
+++ moxy/org.eclipse.persistence.moxy/org.eclipse.persistence.moxy.bnd	(working copy)
@@ -13,7 +13,7 @@
  ${moxy.2.base.dir}/about.html,\
  ${moxy.2.base.dir}/readme.html,\
  ${moxy.2.base.dir}/license.html,\
- xsd=resource/xsd
+  org/eclipse/persistence/jaxb=resource/org/eclipse/persistence/jaxb
 Import-Package:                                                         \
  javax.activation;resolution:=optional;version="1.1.0",                 \
  javax.mail.*;resolution:=optional,                                     \
Index: utils/org.eclipse.persistence.dbws.builder/build.xml
===================================================================
--- utils/org.eclipse.persistence.dbws.builder/build.xml	(revision 8947)
+++ utils/org.eclipse.persistence.dbws.builder/build.xml	(working copy)
@@ -233,7 +233,7 @@
                 <include name="org/eclipse/persistence/**/*.java"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
         </jar>
     </target>
@@ -249,7 +249,7 @@
                 <include name="**/*.class"/>
             </fileset>
             <fileset dir="${resource.dir}">
-                <include name="xsd/*.xsd"/>
+                <include name="org/eclipse/persistence/**/*.xsd"/>
             </fileset>
             <fileset dir="${src.dir}">
                 <include name="META-INF/services/**/*.*"/>
Index: utils/org.eclipse.persistence.dbws.builder/META-INF/MANIFEST.MF
===================================================================
--- utils/org.eclipse.persistence.dbws.builder/META-INF/MANIFEST.MF	(revision 0)
+++ utils/org.eclipse.persistence.dbws.builder/META-INF/MANIFEST.MF	(revision 0)
@@ -0,0 +1,154 @@
+Manifest-Version: 1.0
+Export-Package: _dbws;version="2.3.0.qualifier";uses:="javax.servlet",
+ org.eclipse.persistence.platform.database.oracle.publisher;version="2.3.0.qualifier";uses:="org.eclipse.persistence.platform.database.oracle.publisher.sqlrefl",
+ org.eclipse.persistence.platform.database.oracle.publisher.sqlrefl;version="2.3.0.qualifier";uses:="org.eclipse.persistence.platform.database.oracle.publisher,org.eclipse.persistence.platform.database.oracle.publisher.viewcache,org.eclipse.persistence.platform.database.oracle.publisher.visit",
+ org.eclipse.persistence.platform.database.oracle.publisher.viewcache;version="2.3.0.qualifier";uses:="org.eclipse.persistence.platform.database.oracle.publisher,org.eclipse.persistence.platform.database.oracle.publisher.sqlrefl",
+ org.eclipse.persistence.platform.database.oracle.publisher.visit;version="2.3.0.qualifier";uses:="org.eclipse.persistence.platform.database.oracle.publisher.sqlrefl",
+ org.eclipse.persistence.tools.dbws;version="2.3.0.qualifier";
+  uses:="org.eclipse.persistence.mappings,
+   org.eclipse.persistence.internal.sessions.factories.model.project,
+   org.eclipse.persistence.tools.dbws.oracle,
+   org.eclipse.persistence.oxm.mappings.nullpolicy,
+   org.eclipse.persistence.expressions,
+   org.eclipse.persistence.internal.sessions,
+   org.eclipse.persistence.oxm,
+   org.eclipse.persistence.platform.database,
+   org.eclipse.persistence.oxm.platform,
+   org.eclipse.persistence.descriptors,
+   org.eclipse.persistence.oxm.schema,
+   org.eclipse.persistence.internal.oxm.schema.model,
+   org.eclipse.persistence.mappings.converters,
+   org.eclipse.persistence.internal.sessions.factories.model,
+   javax.xml.namespace,
+   org.eclipse.persistence.platform.database.oracle.publisher.sqlrefl,
+   org.eclipse.persistence.internal.xr,
+   org.eclipse.persistence.platform.database.oracle.plsql,
+   org.eclipse.persistence.internal.databaseaccess,
+   org.eclipse.persistence.internal.helper,
+   org.eclipse.persistence.internal.xr.sxf,
+   org.eclipse.persistence.internal.security,
+   org.eclipse.persistence.dbws,
+   org.eclipse.persistence.sessions,
+   org.eclipse.persistence.internal.sessions.factories,
+   org.eclipse.persistence.tools.dbws.jdbc,
+   org.eclipse.persistence.mappings.structures,
+   javax.wsdl,
+   org.eclipse.persistence.oxm.mappings,
+   org.eclipse.persistence.internal.oxm.schema,
+   org.eclipse.persistence.platform.database.oracle.publisher.visit,
+   org.eclipse.persistence.sessions.factories,
+   org.eclipse.persistence.platform.database.jdbc,
+   org.eclipse.persistence.queries,
+   org.eclipse.persistence.exceptions,
+   org.eclipse.persistence.internal.queries,
+   org.eclipse.persistence.internal.sessions.factories.model.platform,
+   org.eclipse.persistence.internal.sessions.factories.model.log,
+   org.eclipse.persistence.internal.sessions.factories.model.login,
+   org.eclipse.persistence.internal.sessions.factories.model.session,
+   javax.tools,
+   org.eclipse.persistence.internal.dbws,
+   _dbws,
+   javax.wsdl.factory,
+   javax.wsdl.extensions.soap,
+   org.w3c.dom,
+   javax.wsdl.extensions.schema,
+   javax.wsdl.xml,
+   javax.wsdl.extensions,
+   javax.wsdl.extensions.soap12,
+   org.eclipse.persistence",
+ org.eclipse.persistence.tools.dbws.jdbc;version="2.3.0.qualifier";uses:="org.eclipse.persistence.tools.dbws,org.eclipse.persistence.internal.databaseaccess,org.eclipse.persistence.platform.database",
+ org.eclipse.persistence.tools.dbws.oracle;version="2.3.0.qualifier";
+  uses:="org.eclipse.persistence.mappings,
+   org.eclipse.persistence.platform.database.oracle.publisher.visit,
+   org.eclipse.persistence.descriptors,
+   org.eclipse.persistence.mappings.structures,
+   org.eclipse.persistence.internal.helper,
+   org.eclipse.persistence.oxm.mappings.nullpolicy,
+   org.eclipse.persistence.oxm,
+   org.eclipse.persistence.internal.oxm,
+   org.eclipse.persistence.oxm.schema,
+   javax.xml.namespace,
+   org.eclipse.persistence.oxm.mappings,
+   org.eclipse.persistence.tools.dbws,
+   org.eclipse.persistence.tools.dbws.jdbc,
+   org.eclipse.persistence.queries,
+   org.eclipse.persistence.platform.database.oracle.publisher,
+   org.eclipse.persistence.internal.databaseaccess,
+   org.eclipse.persistence.platform.database.oracle.publisher.sqlrefl,
+   org.eclipse.persistence.platform.database.oracle.plsql,
+   org.eclipse.persistence.platform.database.oracle.jdbc,
+   org.eclipse.persistence.platform.database.jdbc"
+Private-Package: xsd,.
+Implementation-Version: 2.3.0.qualifier
+Bundle-ClassPath: .
+Specification-Vendor: Eclipse.org - EclipseLink Project
+Tool: Bnd-0.0.366
+DSTAMP: 20110209
+Bundle-Name: EclipseLink DBWS Builder
+TODAY: February 9 2011
+Created-By: 1.6.0_21 (Sun Microsystems Inc.)
+TSTAMP: 1354
+HK2-Bundle-Name: org.eclipse.persistence:org.eclipse.persistence.dbws.
+ builder
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.persistence.core;bundle-version="2.3.0.qualifier",
+ org.eclipse.persistence.dbws;bundle-version="2.3.0.qualifier"
+Implementation-Vendor: Eclipse.org - EclipseLink Project
+Bundle-Vendor: Eclipse.org - EclipseLink Project
+Bundle-Version: 2.3.0.qualifier
+Bnd-LastModified: 1297277671267
+Bundle-ManifestVersion: 2
+Include-Resource: ../../about.html,../../readme.html,../../license.htm
+ l,xsd=resource/xsd,META-INF/services=src/META-INF/services
+Import-Package: javax.servlet;version="2.4",
+ javax.tools;resolution:=optional,
+ javax.wsdl;version="1.6.2",
+ javax.wsdl.extensions;version="1.6.2",
+ javax.wsdl.extensions.schema;version="1.6.2",
+ javax.wsdl.extensions.soap;version="1.6.2",
+ javax.wsdl.extensions.soap12;version="1.6.2",
+ javax.wsdl.factory;version="1.6.2",
+ javax.wsdl.xml;version="1.6.2",
+ javax.xml.namespace;resolution:=optional,
+ org.eclipse.persistence;version="2.3.0.qualifier",
+ org.eclipse.persistence.dbws;version="2.3.0.qualifier",
+ org.eclipse.persistence.descriptors;version="2.3.0.qualifier",
+ org.eclipse.persistence.exceptions;version="2.3.0.qualifier",
+ org.eclipse.persistence.expressions;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.databaseaccess;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.dbws;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.helper;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.oxm;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.oxm.schema;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.oxm.schema.model;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.queries;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.security;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions.factories;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions.factories.model;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions.factories.model.log;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions.factories.model.login;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions.factories.model.platform;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions.factories.model.project;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.sessions.factories.model.session;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.xr;version="2.3.0.qualifier",
+ org.eclipse.persistence.internal.xr.sxf;version="2.3.0.qualifier",
+ org.eclipse.persistence.mappings;version="2.3.0.qualifier",
+ org.eclipse.persistence.mappings.converters;version="2.3.0.qualifier",
+ org.eclipse.persistence.mappings.structures;version="2.3.0.qualifier",
+ org.eclipse.persistence.oxm;version="2.3.0.qualifier",
+ org.eclipse.persistence.oxm.mappings;version="2.3.0.qualifier",
+ org.eclipse.persistence.oxm.mappings.nullpolicy;version="2.3.0.qualifier",
+ org.eclipse.persistence.oxm.platform;version="2.3.0.qualifier",
+ org.eclipse.persistence.oxm.schema;version="2.3.0.qualifier",
+ org.eclipse.persistence.platform.database;version="2.3.0.qualifier",
+ org.eclipse.persistence.platform.database.jdbc;version="2.3.0.qualifier",
+ org.eclipse.persistence.platform.database.oracle.jdbc;version="2.3.0.qualifier",
+ org.eclipse.persistence.platform.database.oracle.plsql;version="2.3.0.qualifier",
+ org.eclipse.persistence.queries;version="2.3.0.qualifier",
+ org.eclipse.persistence.sessions;version="2.3.0.qualifier",
+ org.eclipse.persistence.sessions.factories;version="2.3.0.qualifier",
+ org.w3c.dom;resolution:=optional
+Specification-Version: 2.3.0
+Bundle-SymbolicName: org.eclipse.persistence.dbws.builder
+
Index: utils/org.eclipse.persistence.dbws.builder/org.eclipse.persistence.dbws.builder.bnd
===================================================================
--- utils/org.eclipse.persistence.dbws.builder/org.eclipse.persistence.dbws.builder.bnd	(revision 8947)
+++ utils/org.eclipse.persistence.dbws.builder/org.eclipse.persistence.dbws.builder.bnd	(working copy)
@@ -1,5 +1,4 @@
-Export-Package: xsd;version="${version.string}";-noimport:=true,       \
- _dbws*;version="${version.string}";-noimport:=true,                   \
+Export-Package: _dbws*;version="${version.string}";-noimport:=true,\
  org.eclipse.persistence*;version="${version.string}";-noimport:=true,
 Bundle-ClassPath: .
 Implementation-Version: ${version.string}
@@ -7,22 +6,23 @@
 Bundle-Name: ${specification.title}
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}
-Require-Bundle: org.eclipse.persistence.core;bundle-version="${version.string}";visibility:=reexport, \
- org.eclipse.persistence.asm;bundle-version="${version.string}";visibility:=reexport, \
- org.eclipse.persistence.dbws;bundle-version="${version.string}";visibility:=reexport
+Require-Bundle: org.eclipse.persistence.core;bundle-version="${version.string}",\
+ org.eclipse.persistence.dbws;bundle-version="${version.string}"
 Implementation-Vendor: ${implementation.vendor}
 Bundle-Vendor: ${implementation.vendor}
 Bundle-Version: ${version.string}
-Include-Resource:                     \
- ${dbwsbldr.2.base.dir}/about.html,   \
- ${dbwsbldr.2.base.dir}/readme.html,  \
- ${dbwsbldr.2.base.dir}/license.html, \
- xsd=resource/xsd,                    \
+Include-Resource:\
+ ${dbwsbldr.2.base.dir}/about.html,\
+ ${dbwsbldr.2.base.dir}/readme.html,\
+ ${dbwsbldr.2.base.dir}/license.html,\
+ xsd=resource/xsd,\
  META-INF/services=src/META-INF/services
-Import-Package:                                                         \
- javax.*;resolution:=optional,                                          \
- org.eclipse.persistence.internal.libraries.asm.*;resolution:=optional, \
- org.eclipse.persistence.*;version="${version.string}",                 \
+Import-Package:\
+ javax.servlet;version="2.4",\
+ javax.wsdl.*;version="1.6.2",\
+ javax.*;resolution:=optional,\
+ org.eclipse.persistence.internal.libraries.antlr.*;resolution:=optional,\
+ org.eclipse.persistence.*;version="${version.string}",\
  org.w3c.*;resolution:=optional, *
 Specification-Version: ${release.version}

Follow-Ups:
- Re: [eclipselink-dev] Transaction for 336179 available. please review.
  - From: Tom Ware

References:
- Re: [eclipselink-dev] XSD Circular dependency resolution...
  - From: Eric Gwin
- Re: [eclipselink-dev] XSD Circular dependency resolution...
  - From: Eric Gwin

Prev by Date: [eclipselink-dev] bug 336731 <shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
Next by Date: Re: [eclipselink-dev] Transaction for 336179 available. please review.
Previous by thread: Re: [eclipselink-dev] XSD Circular dependency resolution...
Next by thread: Re: [eclipselink-dev] Transaction for 336179 available. please review.
Index(es):
- Date
- Thread

Breadcrumbs