geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1143286 - in /geronimo/server/trunk/plugins/j2ee: geronimo-j2ee-builder/src/main/xsd/ geronimo-j2ee-schema/ geronimo-j2ee-schema/src/main/xsd/ geronimo-j2ee-schema/src/main/xsdconfig/ geronimo-naming-builder/ geronimo-naming-builder/src/ma...
Date Wed, 06 Jul 2011 08:17:06 GMT
Author: xuhaihong
Date: Wed Jul  6 08:17:05 2011
New Revision: 1143286

URL: http://svn.apache.org/viewvc?rev=1143286&view=rev
Log:
GERONIMO-6048 Move geronimo-naming.xsd to j2ee/geronimo-j2ee-schema module

Added:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsd/
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsd/geronimo-naming-1.2.xsd
      - copied, changed from r1142550, geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsdconfig/
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsdconfig/xmlconfig.xml
      - copied, changed from r1142550, geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsdconfig/xmlconfig.xml
Removed:
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsdconfig/xmlconfig.xml
Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd?rev=1143286&r1=1143285&r2=1143286&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
Wed Jul  6 08:17:05 2011
@@ -20,6 +20,7 @@
     xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
     attributeFormDefault="unqualified" version="1.0">
 
@@ -40,6 +41,18 @@
         </xs:documentation>
     </xs:annotation>
 
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2"
+        schemaLocation="geronimo-naming-1.2.xsd">
+        <xs:annotation>
+            <xs:documentation>
+                Import partial schema containing common naming elements, the
+                imported plan declares elements like ejb-ref, ejb-local-ref,
+                service-ref, resource-ref, and resource-env-ref required by this
+                plan schema.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:import>
+
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"
         schemaLocation="geronimo-module-1.2.xsd">
         <xs:annotation>
@@ -116,6 +129,26 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
+
+            <xs:group ref="naming:jndiEnvironmentRefsGroup">
+                <xs:annotation>
+                    <xs:documentation>
+                        Reference to jndiEnvironmentRefsGroup group defined in
+                        imported "geronimo-naming-1.2.xsd"
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:group>
+
+            <xs:element ref="naming:message-destination" minOccurs="0"
+                maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>
+                        Reference to message-destination element defined in
+                        imported "geronimo-naming-1.2.xsd"
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+
             <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
                     <xs:documentation>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml?rev=1143286&r1=1143285&r2=1143286&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml Wed Jul  6 08:17:05 2011
@@ -46,6 +46,13 @@
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
 
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.schema</groupId>-->
             <!--<artifactId>geronimo-schema-javaee_6</artifactId>-->
@@ -61,26 +68,41 @@
             <!--<artifactId>geronimo-schema-j2ee_1.4</artifactId>-->
         <!--</dependency>-->
     </dependencies>
-
+    
     <build>
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <!--packages containing "impl" or "internal" are excluded by default
-->
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                         <Import-Package>
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
                             org.apache.xmlbeans.impl.schema;version="2.4",
                             *
                         </Import-Package>
+                        <Export-Package>
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.schema
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
                         <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>
 

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsd/geronimo-naming-1.2.xsd
(from r1142550, geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsd/geronimo-naming-1.2.xsd?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsd/geronimo-naming-1.2.xsd&p1=geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd&r1=1142550&r2=1143286&rev=1143286&view=diff
==============================================================================
    (empty)

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsdconfig/xmlconfig.xml
(from r1142550, geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsdconfig/xmlconfig.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsdconfig/xmlconfig.xml?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsdconfig/xmlconfig.xml&p1=geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsdconfig/xmlconfig.xml&r1=1142550&r2=1143286&rev=1143286&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsdconfig/xmlconfig.xml
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/xsdconfig/xmlconfig.xml
Wed Jul  6 08:17:05 2011
@@ -14,8 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
-    >
+<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
 
     <xb:namespace uri="http://geronimo.apache.org/xml/ns/naming-1.2">
         <xb:package>org.apache.geronimo.xbeans.geronimo.naming</xb:package>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=1143286&r1=1143285&r2=1143286&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml Wed Jul  6 08:17:05
2011
@@ -70,44 +70,7 @@
             <scope>test</scope>
         </dependency>
 
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <Import-Package>
-                            org.apache.geronimo.deployment.xbeans.impl,
-                            org.apache.geronimo.deployment.javabean.xbeans.impl,
-                            org.apache.geronimo.deployment.xbeans,
-                            org.apache.geronimo.deployment.javabean.xbeans,
-                            org.apache.geronimo.deployment.dconfigbean,
-                            org.apache.geronimo.deployment.service,
-                            org.apache.geronimo.deployment.service.jsr88,
-                            org.apache.xmlbeans.impl.schema;version="2.4",
-                            *
-                        </Import-Package>
-                        <Export-Package>
-                            org.apache.geronimo.xbeans.geronimo.naming,
-                            org.apache.geronimo.xbeans.geronimo.naming.impl,
-                            org.apache.geronimo.naming.deployment,
-                            org.apache.geronimo.naming.deployment.jsr88,
-                        </Export-Package>
-                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
-                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    </dependencies>    
 
 </project>
 



Mime
View raw message