geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r1049119 - in /geronimo/server/trunk: framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/ plugins/activemq/ plugins/activemq/activemq-broker-bluep...
Date Tue, 14 Dec 2010 14:57:45 GMT
Author: rickmcguire
Date: Tue Dec 14 14:57:44 2010
New Revision: 1049119

URL: http://svn.apache.org/viewvc?rev=1049119&view=rev
Log:
Fix up all-subprojects profile build

Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml
    geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
Tue Dec 14 14:57:44 2010
@@ -224,10 +224,6 @@
                             <artifactId>cglib-nodep</artifactId>
                         </element>
                         <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
-                        <element>
                             <groupId>xpp3</groupId>
                             <artifactId>xpp3_min</artifactId>
                         </element>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml
Tue Dec 14 14:57:44 2010
@@ -99,12 +99,9 @@ specific services - those should be prov
     </gbean>
 
     <!-- Logging service -->
-    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+    <gbean name="Logger" class="org.apache.geronimo.system.logging.OSGILogServiceWrapper">
      
         <attribute name="configFileName">var/log/server-log4j.properties</attribute>
         <attribute name="refreshPeriodSeconds">60</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
     </gbean>
 
 </module>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml Tue Dec 14 14:57:44
2010
@@ -72,6 +72,11 @@
 
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
Tue Dec 14 14:57:44 2010
@@ -73,6 +73,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml Tue Dec 14 14:57:44
2010
@@ -178,10 +178,10 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo.framework</groupId>
-      <artifactId>karaf-framework</artifactId>
-      <version>${project.version}</version>
-      <type>car</type>
+        <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+        <artifactId>framework</artifactId>
+        <version>${pom.version}</version>
+        <type>car</type>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Tue Dec 14
14:57:44 2010
@@ -59,6 +59,11 @@
 
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Tue Dec 14 14:57:44 2010
@@ -51,7 +51,7 @@
         <profile>
             <id>all-subprojects</id>
             <modules>
-                <module>activemq-jetty-server</module>
+               <module>activemq-jetty-server</module>
             </modules>
         </profile>
         <profile>

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue Dec
14 14:57:44 2010
@@ -158,11 +158,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ejb_3.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-ejb_3.1_spec</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml Tue Dec
14 14:57:44 2010
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>customer-ear</artifactId>
-            <version>2.1.2</version>
+            <version>2.2</version>
             <type>ear</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/history/dependencies.xml
Tue Dec 14 14:57:44 2010
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty7</artifactId>
+        <artifactId>jetty8</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Tue Dec 14 14:57:44 2010
@@ -52,13 +52,13 @@
         <profile>
             <id>it</id>
             <modules>
-                <module>clustering-it</module>
+               <!-- <module>clustering-it</module> -->
             </modules>
         </profile>
         <profile>
             <id>all-subprojects</id>
             <modules>
-                <module>clustering-it</module>
+               <!-- <module>clustering-it</module> -->
             </modules>
         </profile>
     </profiles>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml Tue Dec
14 14:57:44 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>myfaces</artifactId>
@@ -52,11 +52,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-annotation_1.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-bundle</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml?rev=1049119&r1=1049118&r2=1049119&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml
Tue Dec 14 14:57:44 2010
@@ -21,13 +21,13 @@
       xmlns:ui="http://java.sun.com/jsf/facelets">
 	<body>
 	<h:form id="q">
-		<h:outputText value="There is only one big apple and I don't know whether it has been
taken bu another guy! So good luck!" />
+		<h:outputText value="There is only one big apple and I don't know whether it has been
taken by another guy! So good luck!" />
 		<br />
-		<h:commandButton value="I want eat this big apple!" id="q" action="#{appleBean.eatBigApple}"
/>
+		<h:commandButton value="I want to eat this big apple!" id="q" action="#{appleBean.eatBigApple}"
/>
 		<br />
 		<h:outputText value="But there are many small apples! Enjoy it" />
 		<br />
-		<h:commandButton value="I want eat small apples!" id="qq" action="#{appleBean.eatLittleApple}"
/>
+		<h:commandButton value="I want to eat small apples!" id="qq" action="#{appleBean.eatLittleApple}"
/>
 	</h:form>
 	</body>
 </html>
\ No newline at end of file



Mime
View raw message