geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r573767 - in /geronimo/server/trunk: maven-plugins/car-maven-plugin/ maven-plugins/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/ maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/ maven-plugi...
Date Sat, 08 Sep 2007 00:56:27 GMT
Author: djencks
Date: Fri Sep  7 17:56:25 2007
New Revision: 573767

URL: http://svn.apache.org/viewvc?rev=573767&view=rev
Log:
GERONIMO-3330 rename plugin schema so it doesn't conflict with what's in 2.0.1

Added:
    geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd   (contents,
props changed)
      - copied, changed from r573486, geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.2.xsd
Removed:
    geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/plugins-1.2.xsd
    geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.2.xsd
Modified:
    geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml
    geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml Fri Sep  7 17:56:25 2007
@@ -129,7 +129,27 @@
     </dependencies>
     
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <source>1.5</source>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <source>1.5</source>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-plugin-plugin</artifactId>
                 <configuration>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
Fri Sep  7 17:56:25 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <name>Geronimo Configs :: J2EE System</name>
     <category>Geronimo Core</category>
     <description>Apache Geronimo, the J2EE server project of the Apache Software Foundation.</description>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
Fri Sep  7 17:56:25 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <name>Geronimo Configs :: J2EE System</name>
     <category>Geronimo Core</category>
     <description>Apache Geronimo, the J2EE server project of the Apache Software Foundation.</description>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/pom.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/pom.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/pom.xml
Fri Sep  7 17:56:25 2007
@@ -76,7 +76,7 @@
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
                     <instance>
-                        <plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2"
xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+                        <plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.5.2</jvm-version>
                             <prerequisite>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
Fri Sep  7 17:56:25 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <name>Geronimo Maven2 Plugins :: CAR</name>
     <category>Test</category>
     <description>Apache Geronimo, the J2EE server project of the Apache Software Foundation.</description>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
Fri Sep  7 17:56:25 2007
@@ -126,7 +126,7 @@
                         </dependency>
                     </dependencies>
                     <instance>
-                        <plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2"
xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+                        <plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.5.2</jvm-version>
                             <prerequisite>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
Fri Sep  7 17:56:25 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <name>Geronimo Maven2 Plugins :: CAR</name>
     <category>Test</category>
     <description>Apache Geronimo, the J2EE server project of the Apache Software Foundation.</description>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/apt/usage.apt Fri Sep  7
17:56:25 2007
@@ -51,9 +51,9 @@
 </project>
 +----------+
 
-* Define Dependency as Extention
+* Define Dependency as Extension
 
- Install as extention to allow 'car' packaging to be used.
+ Install as extension to allow 'car' packaging to be used.  Normally you do this in pluginManagement
of a parent pom.
 
 +----------+
 <project>

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Fri Sep  7 17:56:25 2007
@@ -1471,7 +1471,7 @@
     }
 
     public static class NamespaceFilter extends XMLFilterImpl {
-        private static String PLUGIN_NS = "http://geronimo.apache.org/xml/ns/plugins-1.2";
+        private static String PLUGIN_NS = "http://geronimo.apache.org/xml/ns/plugins-1.3";
         private static String GBEAN_NS = "http://geronimo.apache.org/xml/ns/attributes-1.2";
 
         private String namespace;

Copied: geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd (from r573486,
geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd?p2=geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd&p1=geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.2.xsd&r1=573486&r2=573767&rev=573767&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd Fri Sep  7
17:56:25 2007
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 
-<xs:schema targetNamespace="http://geronimo.apache.org/xml/ns/plugins-1.2"
-    xmlns:list="http://geronimo.apache.org/xml/ns/plugins-1.2"
+<xs:schema targetNamespace="http://geronimo.apache.org/xml/ns/plugins-1.3"
+    xmlns:list="http://geronimo.apache.org/xml/ns/plugins-1.3"
     xmlns:atts="http://geronimo.apache.org/xml/ns/attributes-1.2"
         xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml Fri Sep
 7 17:56:25 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<geronimo-plugin-list xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
+<geronimo-plugin-list xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <plugin>
         <name>DayTrader Performance Testing App (Jetty/Derby)</name>
         <category>Examples</category>

Modified: geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java?rev=573767&r1=573766&r2=573767&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
Fri Sep  7 17:56:25 2007
@@ -36,7 +36,7 @@
 public class CopyConfigTest extends TestCase {
 
     private final static String CONFIG = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+
-            "<geronimo-plugin xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.2\"
xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\">\n" +
+            "<geronimo-plugin xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\"
xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\">\n" +
             "    <name>Geronimo Configs :: J2EE Deployer</name>\n" +
             "    <description>Apache Geronimo, the J2EE server project of the Apache
Software Foundation.</description>\n" +
             "    <url>http://geronimo.apache.org/</url>\n" +



Mime
View raw message