geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1180776 - in /geronimo/server/trunk: framework/modules/geronimo-shell-base/ framework/modules/geronimo-shell-diagnose/ framework/modules/geronimo-shell/ framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ f...
Date Mon, 10 Oct 2011 03:39:52 GMT
Author: rwonly
Date: Mon Oct 10 03:39:51 2011
New Revision: 1180776

URL: http://svn.apache.org/viewvc?rev=1180776&view=rev
Log:
some codes clean up

Modified:
    geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
    geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
    geronimo/server/trunk/plugins/myfaces/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
    geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml
    geronimo/server/trunk/plugins/tomcat/pom.xml
    geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Mon Oct 10 03:39:51
2011
@@ -27,7 +27,6 @@
     <groupId>org.apache.geronimo.framework</groupId>
     <artifactId>geronimo-shell-base</artifactId>
     <packaging>bundle</packaging>
-    <version>3.0-SNAPSHOT</version>
     <name>Geronimo Framework, Modules :: Shell Commands</name>
 
     <dependencies>

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml Mon Oct 10 03:39:51
2011
@@ -27,7 +27,6 @@
     <groupId>org.apache.geronimo.framework</groupId>
     <artifactId>geronimo-shell-diagnose</artifactId>
     <packaging>bundle</packaging>
-    <version>3.0-SNAPSHOT</version>
     <name>Geronimo Framework, Modules :: Diagnose Shell Command</name>
 
     <dependencies>

Modified: geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml Mon Oct 10 03:39:51 2011
@@ -27,7 +27,6 @@
     <groupId>org.apache.geronimo.framework</groupId>
     <artifactId>geronimo-shell</artifactId>
     <packaging>bundle</packaging>
-    <version>3.0-SNAPSHOT</version>
     <name>Geronimo Framework, Modules :: Shell</name>
 
     <dependencies>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
Mon Oct 10 03:39:51 2011
@@ -47,7 +47,7 @@ import org.apache.geronimo.system.server
 public class ExplicitDefaultArtifactResolver extends DefaultArtifactResolver implements LocalAliasedArtifactResolver
{
     private static final String COMMENT = "#You can use this file to indicate that you want
to substitute one module for another.\n" +
             "#format is oldartifactid=newartifactId e.g.\n" +
-            "#org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2-SNAPSHOT/car\n"
+
+            "#org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2/car\n"
+
             "#versions can be ommitted on the left side but not the right.\n" +
             "#This can also specify explicit versions in the same format.";
 

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
Mon Oct 10 03:39:51 2011
@@ -45,7 +45,7 @@ import org.apache.geronimo.crypto.Encryp
  *
  * To use, include something like this in the rmi-naming module of var/config/config.xml:
  *
- * <gbean name="org.apache.geronimo.framework/rmi-naming/2.1-SNAPSHOT/car?name=ConfiguredEncryption,j2eeType=GBean"
gbeanInfo="org.apache.geronimo.system.util.ConfiguredEncryption">
+ * <gbean name="org.apache.geronimo.framework/rmi-naming/2.1/car?name=ConfiguredEncryption,j2eeType=GBean"
gbeanInfo="org.apache.geronimo.system.util.ConfiguredEncryption">
  * <attribute name="path">var/security/ConfiguredSecretKey.ser</attribute>
  * <reference name="ServerInfo"><pattern><name>ServerInfo</name></pattern></reference>
  * </gbean>

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java
(original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java
Mon Oct 10 03:39:51 2011
@@ -66,7 +66,7 @@ public class TestGBean {
         String clusterName = CLUSTER1;
         String pluginListName = PLUGIN_LIST1;
         int clusterSize = 1;
-        JpaPluginInstance pluginInstance = new JpaPluginInstance("org.apache.geronimo.plugins.it/customer-jetty/2.2-SNAPSHOT/car");
+        JpaPluginInstance pluginInstance = new JpaPluginInstance("org.apache.geronimo.plugins.it/customer-jetty/2.2/car");
         farmGBean.addPluginToCluster(clusterName, pluginListName, pluginInstance);
 
         checkCluster(clusterName, pluginListName, clusterSize);

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
Mon Oct 10 03:39:51 2011
@@ -144,7 +144,7 @@ public class GeronimoAsMavenServlet exte
         if(parts.length < 4) {
             response.sendError(404, "Unrecognized path form "+path);
             return null;
-        } else {  // e.g.   console/MyDatabase/1.0-SNAPSHOT/MyDatabase-1.0-SNAPSHOT.rar
+        } else {  // e.g.   console/MyDatabase/1.0/MyDatabase-1.0.rar
             groupId = parts[0];
             for(int i=4; i<parts.length; i++) {
                 groupId = groupId+"."+parts[i-3];

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml Mon Oct 10 03:39:51
2011
@@ -91,21 +91,6 @@
         <!--</dependency>-->
     </dependencies>
 
-    <!--<pluginRepositories>-->
-        <!--<pluginRepository>-->
-            <!--<id>codehaus</id>-->
-            <!--<name>Codehaus Release Repository</name>-->
-            <!--<url>http://repository.codehaus.org</url>-->
-            <!--<layout>default</layout>-->
-            <!--<snapshots>-->
-                <!--<enabled>false</enabled>-->
-            <!--</snapshots>-->
-            <!--<releases>-->
-                <!--<enabled>true</enabled>-->
-            <!--</releases>-->
-        <!--</pluginRepository>-->
-    <!--</pluginRepositories>-->
-    
     <build>
         <pluginManagement>
             <plugins>

Modified: geronimo/server/trunk/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/pom.xml Mon Oct 10 03:39:51 2011
@@ -32,10 +32,6 @@
     <description>
         MyFaces plugin
     </description>
-
-    <!--<properties>-->
-        <!--<myfacesVersion>2.0.8-SNAPSHOT</myfacesVersion>-->
-    <!--</properties>-->
     
     <modules>
         <module>geronimo-myfaces</module>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
Mon Oct 10 03:39:51 2011
@@ -102,7 +102,7 @@
         <bundle start-level="36">mvn:org.apache.geronimo.modules/geronimo-connector-1_6/${project.version}</bundle>
         <bundle start-level="36">mvn:org.apache.geronimo.components/geronimo-connector/${txmanagerVersion}</bundle>
         <bundle start-level="36">mvn:org.apache.geronimo.framework/geronimo-security/${project.version}</bundle>
-        <!--<bundle start-level="36">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.boot/3.0.0-SNAPSHOT</bundle>-->
+        <!--<bundle start-level="36">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.boot/3.0.0</bundle>-->
         <bundle start-level="36">mvn:org.apache.geronimo.components/geronimo-jaspi/1.1.1</bundle>
         <bundle start-level="36">mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.2_1</bundle>
         <bundle start-level="36">mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.3_1</bundle>
@@ -114,7 +114,7 @@
         <bundle start-level="36">mvn:org.apache.yoko/yoko-spec-corba/${yokoVersion}</bundle>
         <!--<bundle start-level="36">mvn:org.osgi/org.osgi.core/4.2.0</bundle>-->
         <!--<bundle start-level="36">mvn:org.osgi/org.osgi.compendium/4.2.0</bundle>-->
-        <!--<bundle start-level="36">mvn:org.apache.xbean/xbean-asm-shaded/3.8-SNAPSHOT</bundle>-->
+        <!--<bundle start-level="36">mvn:org.apache.xbean/xbean-asm-shaded/3.8</bundle>-->
         <!--<bundle start-level="36">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.3_1</bundle>-->
         <bundle start-level="36">mvn:org.apache.openwebbeans/openwebbeans-jsf/${openwebbeansVersion}</bundle>
         <bundle start-level="36">mvn:org.apache.openjpa/openjpa/${openjpaVersion}</bundle>

Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml Mon Oct 10 03:39:51
2011
@@ -156,7 +156,6 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb</artifactId>
-                            <version>3.0-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Mon Oct 10 03:39:51 2011
@@ -47,9 +47,7 @@
         <module>tomcat7-clustering-wadi</module>
         <module>tomcat7-clustering-builder-wadi</module>
     </modules>
-    <!--<properties>-->
-        <!--<tomcatVersion>7.0.0.2-SNAPSHOT</tomcatVersion>-->
-    <!--</properties>-->
+
     <dependencyManagement>
         <dependencies>
             <!-- Tomcat web container -->

Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml?rev=1180776&r1=1180775&r2=1180776&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml Mon Oct 10 03:39:51
2011
@@ -24,7 +24,6 @@
   </parent>
   <groupId>org.apache.geronimo.plugins</groupId>
   <artifactId>welcome-tomcat-server</artifactId>
-  <version>3.0-SNAPSHOT</version>
   <packaging>server-assembly</packaging>
   <build>
     <pluginManagement>



Mime
View raw message