geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r418888 [7/7] - in /geronimo/branches/pluggable-jacc: ./ applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/ configs/ configs/activemq/ configs/client-deployer/src/plan/ configs/client/ configs/...
Date Tue, 04 Jul 2006 00:50:47 GMT
Modified: geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
Mon Jul  3 17:50:41 2006
@@ -27,7 +27,7 @@
 
 
 /**
- * @version $Rev: 387050 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ContainerTest extends AbstractWebModuleTest {
 

Modified: geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
Mon Jul  3 17:50:41 2006
@@ -33,7 +33,7 @@
 /**
  * Tests the JAAS security for Tomcat
  *
- * @version $Revision: 387050 $ $Date$
+ * @version $Revision$ $Date$
  */
 public class JAASSecurityTest extends AbstractWebModuleTest {
 

Modified: geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
Mon Jul  3 17:50:41 2006
@@ -37,7 +37,7 @@
 import org.apache.geronimo.security.deploy.PrincipalInfo;
 import org.apache.geronimo.security.deploy.Role;
 import org.apache.geronimo.security.deploy.Security;
-import org.apache.geronimo.security.deployment.SecurityBuilder;
+import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
 import org.apache.geronimo.tomcat.util.SecurityHolder;
 
@@ -45,7 +45,7 @@
 /**
  * Tests the JACC security for Tomcat
  *
- * @version $Revision: 387050 $ $Date$
+ * @version $Revision$ $Date$
  */
 public class JACCSecurityTest extends AbstractWebModuleTest {
 
@@ -192,7 +192,7 @@
 
     public void buildPrincipalRoleMap(Security security, Map roleDesignates, Map principalRoleMap)
{
         Map roleToPrincipalMap = new HashMap();
-        SecurityBuilder.buildRolePrincipalMap(security, roleDesignates, roleToPrincipalMap,
getClass().getClassLoader());
+        GeronimoSecurityBuilderImpl.buildRolePrincipalMap(security, roleDesignates, roleToPrincipalMap,
getClass().getClassLoader());
         invertMap(roleToPrincipalMap, principalRoleMap);
     }
 

Modified: geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
Mon Jul  3 17:50:41 2006
@@ -40,7 +40,7 @@
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class Upgrade1_0To1_1 {
 

Modified: geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java
Mon Jul  3 17:50:41 2006
@@ -30,7 +30,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class UpgradeGBean {
 

Modified: geronimo/branches/pluggable-jacc/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/web-builder/pom.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/web-builder/pom.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/web-builder/pom.xml Mon Jul  3 17:50:41 2006
@@ -37,7 +37,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -68,15 +67,15 @@
             <artifactId>stax-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-common</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-deploy-config</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -98,31 +97,32 @@
             <artifactId>geronimo-naming-builder</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-        </dependency>
-
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-j2ee-schema</artifactId>-->
+        <!--</dependency>-->
+<!---->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
+            <scope>test</scope>
         </dependency>
+<!---->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-deployment</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-j2ee</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-        </dependency>
-        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>

Modified: geronimo/branches/pluggable-jacc/modules/web-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/web-builder/project.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/web-builder/project.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/web-builder/project.xml Mon Jul  3 17:50:41 2006
@@ -77,6 +77,9 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
         </dependency>
 
         <dependency>

Modified: geronimo/branches/pluggable-jacc/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Mon Jul  3 17:50:41 2006
@@ -39,12 +39,16 @@
 import javax.security.jacc.WebResourcePermission;
 import javax.security.jacc.WebRoleRefPermission;
 import javax.security.jacc.WebUserDataPermission;
+import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.xbeans.ServiceDocument;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -71,6 +75,8 @@
 import org.apache.geronimo.xbeans.j2ee.UrlPatternType;
 import org.apache.geronimo.xbeans.j2ee.WebAppType;
 import org.apache.geronimo.xbeans.j2ee.WebResourceCollectionType;
+import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
+import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
@@ -78,16 +84,23 @@
 public abstract class AbstractWebModuleBuilder implements ModuleBuilder {
     private static final Log log = LogFactory.getLog(AbstractWebModuleBuilder.class);
     private static final String LINE_SEP = System.getProperty("line.separator");
-    
+
     protected static final AbstractNameQuery MANAGED_CONNECTION_FACTORY_PATTERN;
     private static final AbstractNameQuery ADMIN_OBJECT_PATTERN;
     protected static final AbstractNameQuery STATELESS_SESSION_BEAN_PATTERN;
     protected static final AbstractNameQuery STATEFUL_SESSION_BEAN_PATTERN;
     protected static final AbstractNameQuery ENTITY_BEAN_PATTERN;
     protected final Kernel kernel;
+    protected final NamespaceDrivenBuilderCollection securityBuilders;
+    protected final NamespaceDrivenBuilderCollection serviceBuilders;
+    private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
+    private static final QName SERVICE_QNAME = ServiceDocument.type.getDocumentElementName();
 
-    protected AbstractWebModuleBuilder(Kernel kernel) {
+    protected AbstractWebModuleBuilder(Kernel kernel, Collection securityBuilders, Collection
serviceBuilders) {
         this.kernel = kernel;
+        this.securityBuilders = new NamespaceDrivenBuilderCollection(securityBuilders);
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
+
     }
 
     static {
@@ -218,7 +231,7 @@
                     moduleContext.addFile(targetPath, warFile, entry);
                 }
             }
-            
+
             //always add WEB-INF/classes to the classpath regardless of whether
             //any classes exist
             moduleContext.getConfiguration().addToClassPath("WEB-INF/classes/");
@@ -512,19 +525,19 @@
     private boolean cleanupConfigurationDir(File configurationDir)
     {
         LinkedList cannotBeDeletedList = new LinkedList();
-               
+
         if (!DeploymentUtil.recursiveDelete(configurationDir,cannotBeDeletedList)) {
             // Output a message to help user track down file problem
-            log.warn("Unable to delete " + cannotBeDeletedList.size() + 
-                    " files while recursively deleting directory " 
+            log.warn("Unable to delete " + cannotBeDeletedList.size() +
+                    " files while recursively deleting directory "
                     + configurationDir + LINE_SEP +
                     "The first file that could not be deleted was:" + LINE_SEP + "  "+
                     ( !cannotBeDeletedList.isEmpty() ? cannotBeDeletedList.getFirst() : "")
);
             return false;
         }
         return true;
-    }    
-    
+    }
+
     protected void processRoleRefPermissions(ServletType servletType, Set securityRoles,
Map rolePermissions) {
         String servletName = servletType.getServletName().getStringValue().trim();
         //WebRoleRefPermissions
@@ -550,6 +563,15 @@
             addPermissionToRole(roleName, new WebRoleRefPermission(servletName, roleName),
rolePermissions);
         }
 //        servletData.setAttribute("webRoleRefPermissions", webRoleRefPermissions);
+    }
+
+    protected void buildSubstitutionGroups(XmlObject gerWebApp, boolean hasSecurityRealmName,
Module module, EARContext earContext) throws DeploymentException {
+        XmlObject[] securityElements = XmlBeansUtil.selectSubstitutionGroupElements(SECURITY_QNAME,
gerWebApp);
+        if (securityElements.length > 0 && !hasSecurityRealmName) {
+            throw new DeploymentException("You have supplied a security configuration for
web app " + module.getName() + " but no security-realm-name to allow login");
+        }
+        securityBuilders.build(gerWebApp, earContext, module.getEarContext());
+        serviceBuilders.build(gerWebApp, earContext, module.getEarContext());
     }
 
     class UncheckedItem {

Modified: geronimo/branches/pluggable-jacc/modules/web-builder/src/schema/geronimo-web-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/web-builder/src/schema/geronimo-web-1.1.xsd?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/web-builder/src/schema/geronimo-web-1.1.xsd (original)
+++ geronimo/branches/pluggable-jacc/modules/web-builder/src/schema/geronimo-web-1.1.xsd Mon
Jul  3 17:50:41 2006
@@ -20,7 +20,7 @@
     xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
@@ -28,7 +28,8 @@
     version="1.0">
 
     <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
+    <!--<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>-->
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.1" schemaLocation="geronimo-application-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
 
     <xs:element name="web-app" type="web:web-appType"/>
@@ -48,10 +49,10 @@
 
             <xs:sequence minOccurs="0">
                 <xs:element name="security-realm-name" type="xs:string"/>
-                <xs:element ref="security:security" minOccurs="0"/>
+                <xs:element ref="app:security" minOccurs="0"/>
             </xs:sequence>
 
-            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded"/>
 
         </xs:sequence>
     </xs:complexType>

Modified: geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
Mon Jul  3 17:50:41 2006
@@ -49,7 +49,7 @@
     public void testConvertPlan(String prePlanName, String postPlanName) throws Exception
{
         URL srcXml = classLoader.getResource(prePlanName);
         URL expectedOutputXml = classLoader.getResource(postPlanName);
-        XmlObject rawPlan = XmlBeansUtil.parse(srcXml);
+        XmlObject rawPlan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         System.out.println("RAW PLAN " + rawPlan.toString());
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",

Modified: geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java
(original)
+++ geronimo/branches/pluggable-jacc/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java
Mon Jul  3 17:50:41 2006
@@ -17,17 +17,15 @@
 
 package org.apache.geronimo.web.deployment;
 
-import java.util.Arrays;
 import java.net.URL;
+import java.util.Arrays;
+
 import javax.enterprise.deploy.model.DDBean;
 import javax.enterprise.deploy.model.DDBeanRoot;
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.deployment.tools.loader.WebDeployable;
-import org.apache.geronimo.web.deployment.WebAppDConfigRoot;
-import org.apache.geronimo.web.deployment.WebAppDConfigBean;
-import org.apache.geronimo.web.deployment.WARConfiguration;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/branches/pluggable-jacc/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java
(original)
+++ geronimo/branches/pluggable-jacc/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java
Mon Jul  3 17:50:41 2006
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class RepoCopier {
 

Modified: geronimo/branches/pluggable-jacc/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java
(original)
+++ geronimo/branches/pluggable-jacc/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java
Mon Jul  3 17:50:41 2006
@@ -22,7 +22,8 @@
 import java.io.IOException;
 
 import org.apache.geronimo.deployment.xbeans.ServiceDocument;
-import org.apache.geronimo.deployment.xbeans.ServiceType;
+import org.apache.geronimo.deployment.xbeans.DependenciesType;
+import org.apache.geronimo.deployment.xbeans.DependenciesDocument;
 import org.apache.maven.project.Dependency;
 import org.apache.maven.repository.Artifact;
 import org.apache.xmlbeans.XmlOptions;
@@ -62,8 +63,8 @@
         if (targetDir == null) {
             throw new RuntimeException("No target directory supplied");
         }
-        ServiceDocument serviceDocument = ServiceDocument.Factory.newInstance();
-        ServiceType serviceType = serviceDocument.addNewService();
+        DependenciesDocument serviceDocument = DependenciesDocument.Factory.newInstance();
+        DependenciesType serviceType = serviceDocument.addNewDependencies();
         for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
             Artifact artifact = (Artifact) iterator.next();
             Dependency dependency = artifact.getDependency();

Modified: geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java
(original)
+++ geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java
Mon Jul  3 17:50:41 2006
@@ -34,7 +34,7 @@
 /**
  * Copies all the configurations out of source config store into target config store.
  *
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ConfigCopier {
 

Modified: geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java
(original)
+++ geronimo/branches/pluggable-jacc/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java
Mon Jul  3 17:50:41 2006
@@ -30,7 +30,7 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class PlanProcessorTest extends TestCase {
 

Modified: geronimo/branches/pluggable-jacc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/pom.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/pom.xml (original)
+++ geronimo/branches/pluggable-jacc/pom.xml Mon Jul  3 17:50:41 2006
@@ -24,10 +24,10 @@
     <artifactId>geronimo-parent</artifactId>
     <name>Geronimo</name>
     <description>Geronimo parent</description>
-    
+
     <version>1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
-    
+
     <url>http://geronimo.apache.org</url>
 
     <issueManagement>
@@ -150,6 +150,7 @@
         <asmVersion>1.4.3</asmVersion>
         <asn1Version>0.3.2</asn1Version>
         <axisVersion>1.4</axisVersion>
+        <backportUtilConcurrentVersion>2.1</backportUtilConcurrentVersion>
         <castorVersion>0.9.5.3</castorVersion>
         <cglibVersion>2.1_3</cglibVersion>
         <commonsBeanutilsVersion>1.6.1</commonsBeanutilsVersion>
@@ -216,7 +217,7 @@
         <xfireVersion>20050202</xfireVersion>
         <xmlApisVersion>1.0.b2</xmlApisVersion>
         <xmlbeansVersion>2.0.0</xmlbeansVersion>
-        <xmlbeansMavenPluginVersion>2.0</xmlbeansMavenPluginVersion>
+        <xmlbeansMavenPluginVersion>2.0.1-SNAPSHOT</xmlbeansMavenPluginVersion>
         <xmlParserApisVersion>2.2.1</xmlParserApisVersion>
         <xmlpullVersion>1.1.3.4d_b4_min</xmlpullVersion>
         <xmlResolverVersion>1.1</xmlResolverVersion>
@@ -333,6 +334,24 @@
                 <version>${geronimoSpecServletVersion}</version>
             </dependency>
 
+
+            <dependency>
+                <groupId>openejb</groupId>
+                <artifactId>openejb-core</artifactId>
+                <version>${openejbVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>openejb</groupId>
+                <artifactId>openejb-pkgen-builder</artifactId>
+                <version>${openejbVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>openejb</groupId>
+                <artifactId>openejb-builder</artifactId>
+                <version>${openejbVersion}</version>
+            </dependency>
             <!--
              |
              | External dependency versions
@@ -369,6 +388,12 @@
             </dependency>
 
             <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commonsIoVersion}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>${commonsLoggingVersion}</version>
@@ -506,6 +531,11 @@
                 <artifactId>xbean</artifactId>
                 <version>${xmlbeansVersion}</version>
             </dependency>
+            <dependency>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <version>${xmlbeansMavenPluginVersion}</version>
+            </dependency>
 
             <dependency>
                 <groupId>xml-resolver</groupId>
@@ -536,6 +566,16 @@
                 <version>${geronimoVersion}</version>
                 <type>rar</type>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-activemq-gbean</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-activemq-gbean-management</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
@@ -1205,7 +1245,10 @@
 
                 <plugin>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0</version>
+                    <version>2.0.1-20060611.183352-1</version>
+                    <configuration>
+                        <archiveClasses>true</archiveClasses>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>



Mime
View raw message