geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1084516 - in /geronimo/server/trunk: plugingroups/eba-jetty/ plugingroups/eba-tomcat/ plugingroups/eba-tomcat/src/main/history/ plugins/aries/ plugins/aries/aries-deployer/ plugins/aries/aries-deployer/src/main/history/ plugins/aries/aries...
Date Wed, 23 Mar 2011 09:08:04 GMT
Author: rwonly
Date: Wed Mar 23 09:08:03 2011
New Revision: 1084516

URL: http://svn.apache.org/viewvc?rev=1084516&view=rev
Log:
refact geronimo aries plugin structure

Removed:
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplication.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContext.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContextManager.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationConfigBuilder.java
Modified:
    geronimo/server/trunk/plugingroups/eba-jetty/pom.xml
    geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
    geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java
    geronimo/server/trunk/plugins/aries/pom.xml

Modified: geronimo/server/trunk/plugingroups/eba-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-jetty/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/eba-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/eba-jetty/pom.xml Wed Mar 23 09:08:03 2011
@@ -46,6 +46,12 @@
         <!-- Apache Aries EBA required support -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>aries</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>aries-deployer</artifactId>
             <version>${project.version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml Wed Mar 23 09:08:03 2011
@@ -46,6 +46,12 @@
         <!-- Apache Aries EBA required support -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>aries</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>aries-deployer</artifactId>
             <version>${project.version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml Wed Mar
23 09:08:03 2011
@@ -8,6 +8,11 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>aries</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>aries-deployer</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Wed Mar 23 09:08:03 2011
@@ -40,7 +40,13 @@
             <artifactId>geronimo-aries-builder</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>aries</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
 <!--
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -50,14 +56,14 @@
 -->
 
         <dependency>
-            <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.resolver.obr</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.resolver.obr</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.aries.application</groupId>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Wed
Mar 23 09:08:03 2011
@@ -28,30 +28,10 @@
     </dependency>
     <dependency>
         <groupId>org.apache.aries.application</groupId>
-        <artifactId>org.apache.aries.application.api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.application</groupId>
-        <artifactId>org.apache.aries.application.management</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.application</groupId>
-        <artifactId>org.apache.aries.application.resolver.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.application</groupId>
         <artifactId>org.apache.aries.application.utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>
@@ -97,6 +77,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>aries</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml Wed Mar 23 09:08:03
2011
@@ -24,21 +24,4 @@
         </reference>
     </gbean>
 
-    <gbean name="AppInstaller" class="org.apache.geronimo.aries.builder.ApplicationInstaller">
-        <reference name="Store">
-        </reference>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-aries-builder</artifactId>
-                        <version>${version}</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-    </gbean>
-
 </module>

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml Wed Mar 23 09:08:03
2011
@@ -35,14 +35,22 @@
 
     <dependencies>
         <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-aries</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
             <version>${project.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.utils</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -55,9 +63,6 @@
                         <Export-Package>
                           org.apache.geronimo.aries.builder
                         </Export-Package>
-                        <Import-Package>
-                          *
-                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
Wed Mar 23 09:08:03 2011
@@ -51,7 +51,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
+import org.apache.geronimo.aries.ApplicationInstaller;
 /**
  * @version $Rev:385232 $ $Date$
  */

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
Wed Mar 23 09:08:03 2011
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.aries.builder;
+package org.apache.geronimo.aries;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java
Wed Mar 23 09:08:03 2011
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.aries.builder;
+package org.apache.geronimo.aries;
 
 import java.io.File;
 import java.io.IOException;

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java
Wed Mar 23 09:08:03 2011
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.aries.builder;
+package org.apache.geronimo.aries;
 
 import java.io.File;
 import java.io.FileNotFoundException;

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java
Wed Mar 23 09:08:03 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.aries.builder;
+package org.apache.geronimo.aries;
 
 import java.util.Set;
 

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java
Wed Mar 23 09:08:03 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.aries.builder;
+package org.apache.geronimo.aries;
 
 import java.util.HashSet;
 import java.util.Set;

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java
Wed Mar 23 09:08:03 2011
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.aries.builder;
+package org.apache.geronimo.aries;
 
 import java.io.File;
 import java.io.IOException;

Modified: geronimo/server/trunk/plugins/aries/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/pom.xml Wed Mar 23 09:08:03 2011
@@ -37,6 +37,8 @@
     </description>
     
     <modules>
+        <module>geronimo-aries</module>
+        <module>aries</module>
         <module>geronimo-aries-builder</module>
         <module>aries-deployer</module>
     </modules>



Mime
View raw message