geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r886295 - in /geronimo/server/trunk/plugins: ./ client/client-deployer/ client/client-deployer/src/main/history/ client/client-security/ client/client-security/src/main/plan/ client/client/ client/client/src/main/history/ client/geronimo-cl...
Date Wed, 02 Dec 2009 20:15:26 GMT
Author: gawor
Date: Wed Dec  2 20:15:24 2009
New Revision: 886295

URL: http://svn.apache.org/viewvc?rev=886295&view=rev
Log:
build client module

Modified:
    geronimo/server/trunk/plugins/client/client-deployer/pom.xml
    geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/client/client-security/pom.xml
    geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/client/client/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfiguration.java
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
    geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector-1_6/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/server/trunk/plugins/pom.xml

Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/pom.xml Wed Dec  2 20:15:24 2009
@@ -60,12 +60,6 @@
             <artifactId>geronimo-client-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-connector-builder</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml
Wed Dec  2 20:15:24 2009
@@ -6,12 +6,12 @@
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>client</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>client-transaction-1_6</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/client/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-security/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-security/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-security/pom.xml Wed Dec  2 20:15:24 2009
@@ -41,21 +41,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <!-- not needed in m1 -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-security</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/client/client-security/src/main/plan/plan.xml Wed Dec  2
20:15:24 2009
@@ -52,13 +52,13 @@
         <attribute name="global">true</attribute>
         <xml-reference name="LoginModuleConfiguration">
             <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-${geronimoSchemaVersion}">
-                <lc:login-module control-flag="REQUIRED" server-side="true" wrap-principals="true">
+                <lc:login-module control-flag="REQUIRED" wrap-principals="true">
                     <lc:login-domain-name>client-properties-realm</lc:login-domain-name>
                     <lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>
                     <lc:option name="usersURI">var/security/users.properties</lc:option>
                     <lc:option name="groupsURI">var/security/groups.properties</lc:option>
                 </lc:login-module>
-                <lc:login-module control-flag="REQUIRED" server-side="true" wrap-principals="true">
+                <lc:login-module control-flag="REQUIRED" wrap-principals="true">
                     <lc:login-domain-name>default</lc:login-domain-name>
                     <lc:login-module-class>org.apache.geronimo.security.realm.providers.NamedUsernamePasswordCredentialLoginModule</lc:login-module-class>
                     <lc:option name="Name">default</lc:option>

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Wed Dec  2 20:15:24 2009
@@ -49,12 +49,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jee-specs</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
 
         <!-- ThreadPool -->
         <dependency>
@@ -75,25 +69,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <!-- should be transitive dependency of geronimo-j2ee -->
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-security</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.framework</groupId>-->
             <!--<artifactId>geronimo-crypto</artifactId>-->

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=886295&r1=886294&r2=886295&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 Wed Dec
 2 20:15:24 2009
@@ -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>client</artifactId>
@@ -12,8 +12,28 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>sxc-jaxb</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>sxc-runtime</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-jaspi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-transaction</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -48,8 +68,13 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jee-specs</artifactId>
-        <type>car</type>
+        <artifactId>geronimo-transformer</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.javamail</groupId>
+        <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
@@ -58,6 +83,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-connector-1_6</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee</artifactId>
         <type>jar</type>
     </dependency>
@@ -72,8 +102,63 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>javaee-api</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-transaction-1_6</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-annotation_1.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>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jacc_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -123,6 +208,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.howl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml Wed Dec  2 20:15:24
2009
@@ -44,7 +44,6 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder-1_6</artifactId>
             <version>${version}</version>
-            <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
@@ -60,71 +59,71 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--packages containing "impl" or "internal" are excluded by default
-->
+                        <Export-Package>
+                            org.apache.geronimo.client.builder,
+                            org.apache.geronimo.client.builder.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.client,
+                            org.apache.geronimo.xbeans.geronimo.client.impl
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            org.apache.geronimo.connector.deployment,
+                            org.apache.geronimo.connector.deployment.dconfigbean,
+                            org.apache.geronimo.connector.deployment.jsr88,
+                            org.apache.geronimo.xbeans.connector,
+                            org.apache.geronimo.xbeans.connector.impl,
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
+                            org.apache.geronimo.security.deployment,
+                            org.apache.geronimo.xml.ns.security12,
+                            org.apache.geronimo.xml.ns.security12.impl,
+                            org.apache.geronimo.xbeans.geronimo.credentialstore,
+                            org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
+                            org.apache.geronimo.xbeans.geronimo.jaspi,
+                            org.apache.geronimo.xbeans.geronimo.jaspi.impl,
+                            org.apache.geronimo.xbeans.geronimo.loginconfig,
+                            org.apache.geronimo.xbeans.geronimo.loginconfig.impl,
+                            org.apache.geronimo.xbeans.geronimo.security,
+                            org.apache.geronimo.xbeans.geronimo.security.impl,
+                            org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
+                            org.apache.geronimo.xbeans.geronimo.security.subjectinfo.impl,
+                            *
+                        </Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
-        <plugin>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>maven-bundle-plugin</artifactId>
-            <configuration>
-                <instructions>
-                    <!--packages containing "impl" or "internal" are excluded by default
-->
-                    <Export-Package>
-                        org.apache.geronimo.client.builder,
-                        org.apache.geronimo.client.builder.jsr88,
-                        org.apache.geronimo.xbeans.geronimo.client,
-                        org.apache.geronimo.xbeans.geronimo.client.impl
-                    </Export-Package>
-                    <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
-                    <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
-                    <Import-Package>
-                        org.apache.geronimo.xbeans.javaee.impl,
-                        org.apache.geronimo.xbeans.javaee,
-                        org.apache.geronimo.xbeans.persistence.impl,
-                        org.apache.geronimo.xbeans.persistence,
-                        org.apache.geronimo.xbeans.j2ee.impl,
-                        org.apache.geronimo.xbeans.j2ee,
-                        org.w3.xml.x1998.namespace.impl,
-                        org.w3.xml.x1998.namespace,
-                        org.apache.geronimo.deployment.xbeans.impl,
-                        org.apache.geronimo.deployment.javabean.xbeans.impl,
-                        org.apache.geronimo.deployment.xbeans,
-                        org.apache.geronimo.deployment.javabean.xbeans,
-                        org.apache.geronimo.deployment.dconfigbean,
-                        org.apache.geronimo.deployment.service,
-                        org.apache.geronimo.deployment.service.jsr88,
-                        org.apache.xmlbeans.impl.schema;version="2.4",
-                        org.apache.geronimo.connector.deployment,
-                        org.apache.geronimo.connector.deployment.dconfigbean,
-                        org.apache.geronimo.connector.deployment.jsr88,
-                        org.apache.geronimo.xbeans.connector,
-                        org.apache.geronimo.xbeans.connector.impl
-                        org.apache.geronimo.xbeans.geronimo.j2ee,
-                        org.apache.geronimo.xbeans.geronimo.j2ee.impl,
-                        org.apache.geronimo.j2ee.deployment,
-                        org.apache.geronimo.j2ee.deployment.annotation,
-                        org.apache.geronimo.j2ee.jsr88,
-                        org.apache.geronimo.xbeans.geronimo.naming,
-                        org.apache.geronimo.xbeans.geronimo.naming.impl,
-                        org.apache.geronimo.naming.deployment,
-                        org.apache.geronimo.naming.deployment.jsr88,
-                        org.apache.geronimo.security.deployment,
-                        org.apache.geronimo.xml.ns.security12,
-                        org.apache.geronimo.xml.ns.security12.impl,
-                        org.apache.geronimo.xbeans.geronimo.credentialstore,
-                        org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
-                        org.apache.geronimo.xbeans.geronimo.jaspi,
-                        org.apache.geronimo.xbeans.geronimo.jaspi.impl,
-                        org.apache.geronimo.xbeans.geronimo.loginconfig,
-                        org.apache.geronimo.xbeans.geronimo.loginconfig.impl,
-                        org.apache.geronimo.xbeans.geronimo.security,
-                        org.apache.geronimo.xbeans.geronimo.security.impl,
-                        org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
-                        org.apache.geronimo.xbeans.geronimo.security.subjectinfo.impl,
-                        *
-                    </Import-Package>
-                    <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                </instructions>
-            </configuration>
-        </plugin>
     </build>
 
 </project>

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Wed Dec  2 20:15:24 2009
@@ -57,7 +57,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.SingleElementCollection;
-import org.apache.geronimo.j2ee.ApplicationInfo;
+import org.apache.geronimo.j2ee.deployment.ApplicationInfo;
 import org.apache.geronimo.j2ee.deployment.AppClientModule;
 import org.apache.geronimo.j2ee.deployment.ConnectorModule;
 import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource;
@@ -94,6 +94,7 @@
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -545,7 +546,8 @@
                     ConfigurationModuleType.CAR,
                     earContext.getNaming(),
                     earContext.getConfigurationManager(),
-                    null, //no server name needed on client
+                    null, // FIXME: bundle context for app client module?
+                    null, // no server name needed on client
                     appClientModule.getAppClientName(),
                     transactionManagerObjectName,
                     connectionTrackerObjectName,
@@ -583,19 +585,19 @@
         }
     }
 
-    public void initContext(EARContext earContext, Module clientModule, ClassLoader cl) throws
DeploymentException {
+    public void initContext(EARContext earContext, Module clientModule, Bundle bundle) throws
DeploymentException {
         namingBuilders.buildEnvironment(clientModule.getSpecDD(), clientModule.getVendorDD(),
((AppClientModule) clientModule).getEnvironment());
 
         AppClientModule appClientModule = ((AppClientModule) clientModule);
         for (ConnectorModule connectorModule : appClientModule.getResourceModules()) {
-            getConnectorModuleBuilder().initContext(appClientModule.getEarContext(), connectorModule,
cl);
+            getConnectorModuleBuilder().initContext(appClientModule.getEarContext(), connectorModule,
bundle);
         }
         for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
-            mbe.initContext(earContext, clientModule, cl);
+            mbe.initContext(earContext, clientModule, bundle);
         }
     }
 
-    public void addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader,
Collection repositories) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, Bundle earBundle, Collection
repositories) throws DeploymentException {
 
         AppClientModule appClientModule = (AppClientModule) module;
         JarFile moduleFile = module.getModuleFile();
@@ -657,7 +659,7 @@
                 addManifestClassPath(appClientDeploymentContext, appClientModule.getEarFile(),
moduleFile, moduleBase);
 
                 // get the classloader
-                ClassLoader appClientClassLoader = appClientDeploymentContext.getClassLoader();
+                Bundle appClientClassBundle = appClientDeploymentContext.getDeploymentBundle();
             
 
                 // pop in all the gbeans declared in the geronimo app client file
                 if (geronimoAppClient != null) {
@@ -665,7 +667,7 @@
                     //deploy the resource adapters specified in the geronimo-application.xml
 
                     for (ConnectorModule connectorModule : appClientModule.getResourceModules())
{
-                        getConnectorModuleBuilder().addGBeans(appClientDeploymentContext,
connectorModule, appClientClassLoader, repositories);
+                        getConnectorModuleBuilder().addGBeans(appClientDeploymentContext,
connectorModule, appClientClassBundle, repositories);
                     }
                 }
 
@@ -756,7 +758,7 @@
 
                 //TODO this may definitely not be the best place for this!
                 for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
-                    mbe.addGBeans(appClientDeploymentContext, appClientModule, appClientClassLoader,
repositories);
+                    mbe.addGBeans(appClientDeploymentContext, appClientModule, appClientClassBundle,
repositories);
                 }
 
                 // get the configuration data
@@ -795,13 +797,13 @@
         List<Class> classes = new ArrayList<Class>();
 
         // Get the classloader from the module's EARContext
-        ClassLoader classLoader = appClientModule.getEarContext().getClassLoader();
+        Bundle bundle = appClientModule.getEarContext().getDeploymentBundle();
 
         // Get the main class from the module
         String mainClass = appClientModule.getMainClassName();
         Class<?> mainClas;
         try {
-            mainClas = classLoader.loadClass(mainClass);
+            mainClas = bundle.loadClass(mainClass);
         }
         catch (ClassNotFoundException e) {
             throw new DeploymentException("AppClientModuleBuilder: Could not load main class:
" + mainClass, e);
@@ -816,7 +818,7 @@
             FullyQualifiedClassType cls = appClient.getCallbackHandler();
             Class<?> clas;
             try {
-                clas = classLoader.loadClass(cls.getStringValue().trim());
+                clas = bundle.loadClass(cls.getStringValue().trim());
             }
             catch (ClassNotFoundException e) {
                 throw new DeploymentException("AppClientModuleBuilder: Could not load callback-handler
class: " + cls.getStringValue(), e);

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigBean.java
Wed Dec  2 20:15:24 2009
@@ -19,7 +19,7 @@
 
 import javax.enterprise.deploy.model.DDBean;
 
-import org.apache.geronimo.deployment.plugin.DConfigBeanSupport;
+import org.apache.geronimo.deployment.dconfigbean.DConfigBeanSupport;
 import org.apache.xmlbeans.SchemaTypeLoader;
 
 /**

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfiguration.java?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfiguration.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfiguration.java
Wed Dec  2 20:15:24 2009
@@ -22,7 +22,7 @@
 
 import javax.enterprise.deploy.model.DeployableObject;
 
-import org.apache.geronimo.deployment.plugin.DeploymentConfigurationSupport;
+import org.apache.geronimo.deployment.dconfigbean.DeploymentConfigurationSupport;
 
 /**
  *

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
Wed Dec  2 20:15:24 2009
@@ -24,7 +24,7 @@
 import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
 
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;

Modified: geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/pom.xml Wed Dec  2 20:15:24 2009
@@ -45,18 +45,6 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.components</groupId>
-                    <artifactId>geronimo-jaspi</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jee-specs</artifactId>
-            <version>${version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml Wed Dec  2
20:15:24 2009
@@ -65,22 +65,6 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.components</groupId>-->
-            <!--<artifactId>geronimo-connector</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-transaction</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.components</groupId>-->
-            <!--<artifactId>geronimo-transaction</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
             <!--<artifactId>geronimo-persistence-jpa20</artifactId>-->
             <!--<version>${version}</version>-->

Modified: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
Wed Dec  2 20:15:24 2009
@@ -7,16 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-connector</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-transaction</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>client</artifactId>
         <type>car</type>
@@ -26,49 +16,4 @@
         <artifactId>client-security</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-naming</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-security</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-connector-1_6</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-transaction-1_6</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.objectweb.howl</groupId>
-        <artifactId>howl</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Wed Dec  2 20:15:24 2009
@@ -35,7 +35,7 @@
     </description>
 
     <modules>
-        <!--<module>client-transaction-1_6</module>-->
+        <module>client-transaction-1_6</module>
         <module>connector-deployer-1_6</module>
         <module>geronimo-connector-1_6</module>
         <module>geronimo-connector-builder-1_6</module>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Wed Dec  2 20:15:24 2009
@@ -582,7 +582,8 @@
                     applicationInfo.getModuleName(),
                     transactionManagerObjectName,
                     connectionTrackerObjectName,
-                    corbaGBeanObjectName
+                    corbaGBeanObjectName,
+                    new HashMap()
             );
             applicationInfo.setEarContext(earContext);
             applicationInfo.setRootEarContext(earContext);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
Wed Dec  2 20:15:24 2009
@@ -61,13 +61,42 @@
                       AbstractNameQuery connectionTrackerObjectName,
                       AbstractNameQuery corbaGBeanObjectName
     ) throws DeploymentException {
+        this(baseDir, 
+             inPlaceConfigurationDir, 
+             environment, 
+             moduleType, 
+             naming, 
+             configurationManager, 
+             bundleContext, 
+             serverName,
+             baseName,
+             transactionManagerObjectName,
+             connectionTrackerObjectName,
+             corbaGBeanObjectName,
+             new HashMap());
+    }
+    
+    public EARContext(File baseDir,
+                      File inPlaceConfigurationDir,
+                      Environment environment,
+                      ConfigurationModuleType moduleType,
+                      Naming naming,
+                      ConfigurationManager configurationManager,
+                      BundleContext bundleContext,
+                      AbstractNameQuery serverName,
+                      AbstractName baseName,
+                      AbstractNameQuery transactionManagerObjectName,
+                      AbstractNameQuery connectionTrackerObjectName,
+                      AbstractNameQuery corbaGBeanObjectName,
+                      Map messageDestinations
+    ) throws DeploymentException {
         super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming,
configurationManager, bundleContext);
 
         this.serverName = serverName;
         this.transactionManagerObjectName = transactionManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
-        this.messageDestinations = new HashMap();
+        this.messageDestinations = messageDestinations;
     }
 
 //    public EARContext(File baseDir,

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=886295&r1=886294&r2=886295&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Dec  2 20:15:24 2009
@@ -103,7 +103,7 @@
         <module>aspectj</module>
         <!--<module>axis</module>-->
         <!--<module>axis2</module>-->
-        <!--<module>client</module>-->
+        <module>client</module>
         <module>clustering</module>
         <module>connector-1_6</module>
         <!--<module>console</module>-->



Mime
View raw message