geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r436915 - in /geronimo/server/trunk/modules/j2ee-schema: ./ src/catalog/ src/conf/ src/j2ee_1_2schema/ src/j2ee_1_3schema/ src/j2ee_1_4schema/ src/resources/ src/resources2/ src/resources2/META-INF/
Date Fri, 25 Aug 2006 19:31:21 GMT
Author: jdillon
Date: Fri Aug 25 12:31:20 2006
New Revision: 436915

URL: http://svn.apache.org/viewvc?rev=436915&view=rev
Log:
(GERONIMO-2332) Applied GERONIMO-2332-trunk-v2.patch as it overlapped with m2 layout standardization

Added:
    geronimo/server/trunk/modules/j2ee-schema/src/resources2/
    geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/
    geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml
  (with props)
Removed:
    geronimo/server/trunk/modules/j2ee-schema/src/catalog/
    geronimo/server/trunk/modules/j2ee-schema/src/conf/
    geronimo/server/trunk/modules/j2ee-schema/src/j2ee_1_2schema/
    geronimo/server/trunk/modules/j2ee-schema/src/j2ee_1_3schema/
    geronimo/server/trunk/modules/j2ee-schema/src/j2ee_1_4schema/
    geronimo/server/trunk/modules/j2ee-schema/src/resources/
Modified:
    geronimo/server/trunk/modules/j2ee-schema/pom.xml

Modified: geronimo/server/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/j2ee-schema/pom.xml?rev=436915&r1=436914&r2=436915&view=diff
==============================================================================
--- geronimo/server/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/modules/j2ee-schema/pom.xml Fri Aug 25 12:31:20 2006
@@ -70,6 +70,22 @@
             <artifactId>geronimo-service-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
+        <!--
+        NOTE: The full source for this artifact is private due to Sun licensing issues.
+              To view the generated XmlBeans source please see the -src artifact in the repository:
+              
+              http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema/geronimo-schema-j2ee1.4/
+              
+              The full source is here with restricted access:
+              
+              https://svn.apache.org/repos/tck/geronimo-tck/schema/j2ee14
+        -->
+        <dependency>
+             <groupId>org.apache.geronimo.schema</groupId>
+             <artifactId>geronimo-schema-j2ee1.4</artifactId>
+             <version>1.0-SNAPSHOT</version>
+         </dependency>
 
     </dependencies>
     
@@ -83,7 +99,7 @@
 
         <resources>
             <resource>
-                <directory>src/resources</directory>
+                <directory>src/resources2</directory>
             </resource>
         </resources>
 
@@ -96,47 +112,6 @@
                 <directory>src/test-resources</directory>
             </testResource>
         </testResources>
-        
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <schemaDirectory>${pom.basedir}/src</schemaDirectory>
-                    <sourceSchemas>j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd</sourceSchemas>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">${pom.basedir}/src/conf</xmlConfig>
-                    </xmlConfigs>
-                </configuration>
-            </plugin>
-            
-            
-            <!--
-            HACK: Copy the generated XmlBeans bits for clover
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
 </project>

Added: geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml?rev=436915&view=auto
==============================================================================
--- geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml
(added)
+++ geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml
Fri Aug 25 12:31:20 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:dependency>
+        <dep:groupId>org.apache.geronimo.schema</dep:groupId>
+        <dep:artifactId>geronimo-schema-j2ee1.4</dep:artifactId>
+        <dep:version>1.0-SNAPSHOT</dep:version>
+    </dep:dependency>
+</dep:service>
\ No newline at end of file

Propchange: geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/j2ee-schema/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message