Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 547C332C9 for ; Mon, 2 May 2011 21:49:58 +0000 (UTC) Received: (qmail 51966 invoked by uid 500); 2 May 2011 21:49:58 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 51925 invoked by uid 500); 2 May 2011 21:49:58 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 51918 invoked by uid 99); 2 May 2011 21:49:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 21:49:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 21:49:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1AA2123888FE; Mon, 2 May 2011 21:49:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098802 [1/3] - in /geronimo/server/branches/3.0-osgi: ./ framework/ framework/modules/geronimo-deployment/ framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/ framework/modules/geronimo-service-bui... Date: Mon, 02 May 2011 21:49:25 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110502214926.1AA2123888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Mon May 2 21:49:22 2011 New Revision: 1098802 URL: http://svn.apache.org/viewvc?rev=1098802&view=rev Log: Get j2ee plugin to build. Remove jsr88 beans. Use sun jaxb maven plugin with episodes Added: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/META-INF/ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/META-INF/sun-jaxb.episode geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/geronimo-module-1.2.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/META-INF/ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/META-INF/sun-jaxb.episode geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/catalog.cat geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/META-INF/ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/META-INF/sun-jaxb.episode geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-credential-store-1.0.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-jaspi.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-login-config-2.0.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-security-2.0.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-subject-info-1.0.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java (with props) geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java (with props) geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java (with props) geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java (with props) geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java (with props) geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/META-INF/ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/META-INF/sun-jaxb.episode geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/catalog.cat geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd (contents, props changed) - copied, changed from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd Removed: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-module-1.2.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfiguration.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/security/AuthenticationWrapper.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/WebAppDConfigTest.java Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/pom.xml geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/pom.xml geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlAttributeBuilder.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlReferenceBuilder.java geronimo/server/branches/3.0-osgi/framework/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/security/ObjectFactory.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/utils/WebAppXmlAttributeBuilder.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/javaee-builder-support/pom.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml geronimo/server/branches/3.0-osgi/plugins/j2ee/pom.xml geronimo/server/branches/3.0-osgi/pom.xml Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/pom.xml (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/pom.xml Mon May 2 21:49:22 2011 @@ -45,10 +45,10 @@ ${project.version} - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.xmlbeans - + + + + Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/pom.xml (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/pom.xml Mon May 2 21:49:22 2011 @@ -101,7 +101,7 @@ org.apache.geronimo.deployment.dconfigbean, - org.apache.geronimo.deployment.service, + org.apache.geronimo.deployment.service.*, @@ -118,22 +118,37 @@ jaxb + + + + + + + + + + + + + + + + + + - org.codehaus.mojo - jaxb2-maven-plugin - - - - - xjc - - - + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin - src/main/xsd - org.apache.geronimo.deployment.service.plan - - true + org.apache.geronimo.deployment.service.plan + + + + + + + + Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlAttributeBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlAttributeBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlAttributeBuilder.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlAttributeBuilder.java Mon May 2 21:49:22 2011 @@ -16,7 +16,6 @@ */ package org.apache.geronimo.deployment.service; -import org.apache.xmlbeans.XmlObject; import org.apache.geronimo.common.DeploymentException; import org.osgi.framework.Bundle; Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlReferenceBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlReferenceBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlReferenceBuilder.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/XmlReferenceBuilder.java Mon May 2 21:49:22 2011 @@ -20,7 +20,6 @@ import org.apache.geronimo.common.Deploy import org.apache.geronimo.deployment.DeploymentContext; import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.gbean.ReferencePatterns; -import org.apache.xmlbeans.XmlObject; import org.osgi.framework.Bundle; /** @@ -30,6 +29,6 @@ public interface XmlReferenceBuilder { String getNamespace(); - ReferencePatterns getReferences(XmlObject xmlObject, DeploymentContext context, AbstractName moduleAbstractName, Bundle bundle) throws DeploymentException; + ReferencePatterns getReferences(Object xmlObject, DeploymentContext context, AbstractName moduleAbstractName, Bundle bundle) throws DeploymentException; } Added: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/META-INF/sun-jaxb.episode URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/META-INF/sun-jaxb.episode?rev=1098802&view=auto ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/META-INF/sun-jaxb.episode (added) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/META-INF/sun-jaxb.episode Mon May 2 21:49:22 2011 @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copied: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/geronimo-module-1.2.xsd (from r1096963, geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/geronimo-module-1.2.xsd?p2=geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/geronimo-module-1.2.xsd&p1=geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== (empty) Propchange: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/geronimo-module-1.2.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/geronimo-module-1.2.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/main/resources/geronimo-module-1.2.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/server/branches/3.0-osgi/framework/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/pom.xml (original) +++ geronimo/server/branches/3.0-osgi/framework/pom.xml Mon May 2 21:49:22 2011 @@ -117,18 +117,6 @@ - org.apache.geronimo.bundles - sxc-jaxb - ${sxcVersion} - - - - org.apache.geronimo.bundles - sxc-runtime - ${sxcVersion} - - - org.apache.servicemix.bundles org.apache.servicemix.bundles.commons-jexl 1.1_3 Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/pom.xml Mon May 2 21:49:22 2011 @@ -34,11 +34,11 @@ Geronimo Plugins, J2EE :: Builder - - org.apache.geronimo.modules - geronimo-j2ee-schema - ${project.version} - + + + + + org.apache.openejb openejb-jee @@ -118,14 +118,13 @@ org.apache.geronimo.j2ee.deployment, + org.apache.geronimo.j2ee.deployment.model.*, org.apache.geronimo.j2ee.deployment.util, - org.apache.geronimo.j2ee.deployment.annotation, - org.apache.geronimo.j2ee.jsr88 + org.apache.geronimo.j2ee.deployment.annotation - org.apache.geronimo.deployment.dconfigbean, - org.apache.geronimo.deployment.service, - org.apache.geronimo.deployment.service.jsr88, + javax.xml.ws.*;resolution:=optional, + org.apache.xmlbeans.*;resolution:=optional, * @@ -275,6 +274,39 @@ + + + jaxb + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + + true + true + + src/main/resources/catalog.cat + org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver + + + org.apache.geronimo.framework + geronimo-service-builder + + + + + org.apache.geronimo.framework + geronimo-service-builder + + + + + + + + + Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Mon May 2 21:49:22 2011 @@ -24,14 +24,13 @@ import org.apache.geronimo.j2ee.jndi.Jnd import org.apache.geronimo.kernel.config.ConfigurationModuleType; import org.apache.geronimo.kernel.repository.Environment; import org.apache.openejb.jee.ApplicationClient; -import org.apache.xmlbeans.XmlObject; /** * TODO there is almost certainly a problem with the serverEnvironment when deploying a stand alone app client outside an ear. * * @version $Rev$ $Date$ */ -public class AppClientModule extends Module { +public class AppClientModule extends Module { private final Environment serverEnvironment; private JarFile earFile; private final AbstractName appClientName; @@ -47,7 +46,7 @@ public class AppClientModule extends Mod String targetPath, ApplicationClient specDD, String mainClassName, - XmlObject vendorDD, + U vendorDD, String originalSpecDD, Map> jndiContext, Module parentModule) { Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Mon May 2 21:49:22 2011 @@ -24,7 +24,6 @@ import org.apache.geronimo.j2ee.jndi.Jnd import org.apache.geronimo.kernel.config.ConfigurationModuleType; import org.apache.geronimo.kernel.repository.Environment; import org.apache.openejb.jee.EjbJar; -import org.apache.xmlbeans.XmlObject; /** * @version $Rev$ $Date$ Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Mon May 2 21:49:22 2011 @@ -16,8 +16,15 @@ */ package org.apache.geronimo.j2ee.deployment; +import java.io.File; +import java.net.URL; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.jar.JarFile; + import org.apache.geronimo.common.DeploymentException; -import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil; import org.apache.geronimo.deployment.ModuleIDBuilder; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; @@ -25,23 +32,11 @@ import org.apache.geronimo.gbean.Referen import org.apache.geronimo.gbean.ReferenceCollectionEvent; import org.apache.geronimo.gbean.ReferenceCollectionListener; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; -import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.kernel.Naming; import org.apache.geronimo.kernel.config.ConfigurationStore; -import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.XmlException; -import org.apache.xmlbeans.XmlObject; +import org.apache.geronimo.kernel.repository.Environment; import org.osgi.framework.Bundle; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.jar.JarFile; - /** * @version $Rev:386276 $ $Date$ */ @@ -107,32 +102,34 @@ public class SwitchingModuleBuilder impl } private String getNamespaceFromPlan(Object plan) throws DeploymentException { - XmlObject xmlObject; - if (plan instanceof File) { - try { - xmlObject = XmlBeansUtil.parse(((File) plan).toURI().toURL(), getClass().getClassLoader()); - } catch (IOException e) { - throw new DeploymentException("Could not read plan file", e); - } catch (XmlException e) { - throw new DeploymentException("Plan file does not contain well formed xml", e); - } - } else if (plan instanceof XmlObject) { - xmlObject = (XmlObject) plan; - } else { - return defaultNamespace; - } - XmlCursor cursor = xmlObject.newCursor(); - try { - while (cursor.hasNextToken()){ - if (cursor.isStart()) { - return cursor.getName().getNamespaceURI(); - } - cursor.toNextToken(); - } - } finally { - cursor.dispose(); - } - throw new DeploymentException("Cannot find namespace in xmlObject: " + xmlObject.xmlText()); + //TODO implement without xmlbeans + return null; +// XmlObject xmlObject; +// if (plan instanceof File) { +// try { +// xmlObject = XmlBeansUtil.parse(((File) plan).toURI().toURL(), getClass().getClassLoader()); +// } catch (IOException e) { +// throw new DeploymentException("Could not read plan file", e); +// } catch (XmlException e) { +// throw new DeploymentException("Plan file does not contain well formed xml", e); +// } +// } else if (plan instanceof XmlObject) { +// xmlObject = (XmlObject) plan; +// } else { +// return defaultNamespace; +// } +// XmlCursor cursor = xmlObject.newCursor(); +// try { +// while (cursor.hasNextToken()){ +// if (cursor.isStart()) { +// return cursor.getName().getNamespaceURI(); +// } +// cursor.toNextToken(); +// } +// } finally { +// cursor.dispose(); +// } +// throw new DeploymentException("Cannot find namespace in xmlObject: " + xmlObject.xmlText()); } private ModuleBuilder getBuilderFromNamespace(String namespace) { Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java Mon May 2 21:49:22 2011 @@ -26,12 +26,11 @@ import org.apache.geronimo.j2ee.jndi.Jnd import org.apache.geronimo.kernel.config.ConfigurationModuleType; import org.apache.geronimo.kernel.repository.Environment; import org.apache.openejb.jee.WebApp; -import org.apache.xmlbeans.XmlObject; /** * @version $Rev$ $Date$ */ -public class WebModule extends Module { +public class WebModule extends Module { private final String contextRoot; public static final String WEB_APP_DATA = "WEB_APP_DATA"; public static final String WEB_APP_INFO = "WEB_APP_INFO"; @@ -43,7 +42,7 @@ public class WebModule extends Module + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/catalog.cat URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/catalog.cat?rev=1098802&view=auto ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/catalog.cat (added) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/catalog.cat Mon May 2 21:49:22 2011 @@ -0,0 +1,3 @@ +PUBLIC "http://geronimo.apache.org/xml/ns/deployment-1.2" "classpath:geronimo-module-1.2.xsd" + +-- REWRITE_SYSTEM "geronimo-module-1.2.xsd" "classpath:geronimo-module-1.2.xsd" Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd Mon May 2 21:49:22 2011 @@ -17,13 +17,23 @@ --> + xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:jxb="http://java.sun.com/xml/ns/jaxb" + targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" + xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2" + xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + attributeFormDefault="unqualified" version="1.0" + jxb:version="2.1"> + + + + + + + + + This is an XML Schema Definition for Geronimo enterprise application deployment plan. In case the enterprise application deployment plan @@ -40,10 +50,10 @@ - + + schemaLocation="geronimo-module-1.2.xsd" Import Geronimo Services deployment plans. The imported plan includes complex types like moduleType, environmentType, dependenciesType, etc. required by this plan schema. Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-application-2.0.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd Mon May 2 21:49:22 2011 @@ -17,11 +17,22 @@ --> + xmlns:gernaming="http://geronimo.apache.org/xml/ns/naming-1.2" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + attributeFormDefault="unqualified" version="1.0" + xmlns:jxb="http://java.sun.com/xml/ns/jaxb" + jxb:version="2.1"> + + + + + + + + + This is a partial XML Schema Definition for common naming elements for resolving EJB, Web, services, or resource references. This Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/resources/geronimo-naming-1.2.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java Mon May 2 21:49:22 2011 @@ -16,15 +16,7 @@ */ package org.apache.geronimo.j2ee.deployment; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil; -import org.apache.geronimo.schema.SchemaConversionUtils; -import org.apache.geronimo.testsupport.XmlBeansTestSupport; -import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.XmlObject; +import junit.framework.TestCase; /** * ejb 1.1 dtd appears to be a subset of ejb 2.0 dtd so the same xsl should @@ -32,7 +24,7 @@ import org.apache.xmlbeans.XmlObject; * * @version $Rev$ $Date$ */ -public class SchemaConversionTest extends XmlBeansTestSupport { +public class SchemaConversionTest extends TestCase { private ClassLoader classLoader = this.getClass().getClassLoader(); Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/pom.xml (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/pom.xml Mon May 2 21:49:22 2011 @@ -100,24 +100,12 @@ - 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.xbeans.geronimo.naming, - org.apache.geronimo.xbeans.geronimo.naming.impl, org.apache.geronimo.naming.deployment, - org.apache.geronimo.naming.deployment.jsr88, - <_exportcontents>schemaorg_apache_xmlbeans* - schemaorg_apache_xmlbeans.* Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Mon May 2 21:49:22 2011 @@ -42,7 +42,6 @@ import org.apache.geronimo.kernel.reposi import org.apache.geronimo.kernel.repository.Dependency; import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.kernel.repository.ImportType; -import org.apache.geronimo.schema.NamespaceElementConverter; import org.apache.openejb.jee.InjectionTarget; import org.apache.openejb.jee.JndiConsumer; import org.osgi.framework.Bundle; @@ -58,8 +57,8 @@ public abstract class AbstractNamingBuil // protected static final QName BASE_NAMING_QNAME = GerAbstractNamingEntryType.type.getDocumentElementName(); protected static final String J2EE_NAMESPACE = "http://java.sun.com/xml/ns/j2ee"; protected static final String JEE_NAMESPACE = "http://java.sun.com/xml/ns/javaee"; - protected static final NamespaceElementConverter J2EE_CONVERTER = new NamespaceElementConverter(J2EE_NAMESPACE); - protected static final NamespaceElementConverter JEE_CONVERTER = new NamespaceElementConverter(JEE_NAMESPACE); +// protected static final NamespaceElementConverter J2EE_CONVERTER = new NamespaceElementConverter(J2EE_NAMESPACE); +// protected static final NamespaceElementConverter JEE_CONVERTER = new NamespaceElementConverter(JEE_NAMESPACE); // protected static final NamespaceElementConverter NAMING_CONVERTER = new NamespaceElementConverter(GerAbstractNamingEntryDocument.type.getDocumentElementName().getNamespaceURI()); private final Environment defaultEnvironment; Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Mon May 2 21:49:22 2011 @@ -46,7 +46,6 @@ import org.apache.openejb.jee.EnvEntry; import org.apache.openejb.jee.InjectionTarget; import org.apache.openejb.jee.JndiConsumer; import org.apache.openejb.jee.Text; -import org.apache.xmlbeans.QNameSet; import org.osgi.framework.Bundle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -214,9 +213,6 @@ public class EnvironmentEntryBuilder ext // return envEntryQNameSet; // } - public QNameSet getPlanQNameSet() { - return QNameSet.EMPTY; - } public static class EnvEntryRefProcessor extends ResourceAnnotationHelper.ResourceProcessor { Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/pom.xml (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/pom.xml Mon May 2 21:49:22 2011 @@ -103,29 +103,56 @@ org.apache.felix maven-bundle-plugin - - - - org.apache.geronimo.security.deployment, - org.apache.geronimo.xml.ns.security12, - org.apache.geronimo.xml.ns.security12.impl, - - <_exportcontents>schemaorg_apache_xmlbeans* - schemaorg_apache_xmlbeans.* - - org.apache.geronimo.deployment.dconfigbean, - org.apache.geronimo.deployment.service, - org.apache.geronimo.deployment.service.jsr88, - org.apache.geronimo.j2ee.deployment, - org.apache.geronimo.j2ee.deployment.annotation, - org.apache.geronimo.j2ee.jsr88, - * - - - + + + + + + + + + + + + + + + + + jaxb + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + + true + true + + + + + + + + + + + + + + + + + + + + + + Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java Mon May 2 21:49:22 2011 @@ -32,7 +32,6 @@ import org.apache.geronimo.deployment.De import org.apache.geronimo.deployment.ModuleIDBuilder; import org.apache.geronimo.deployment.NamespaceDrivenBuilder; import org.apache.geronimo.deployment.service.EnvironmentBuilder; -import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil; import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.gbean.AbstractNameQuery; import org.apache.geronimo.gbean.GBeanData; @@ -47,10 +46,6 @@ import org.apache.geronimo.kernel.GBeanA import org.apache.geronimo.kernel.Naming; import org.apache.geronimo.kernel.config.ConfigurationStore; import org.apache.geronimo.kernel.repository.Environment; -import org.apache.geronimo.schema.ElementConverter; -import org.apache.geronimo.schema.NamespaceElementConverter; -import org.apache.geronimo.schema.SchemaConversionUtils; -import org.apache.geronimo.schema.SecurityElementConverter; import org.apache.geronimo.security.SecurityNames; import org.apache.geronimo.security.credentialstore.CredentialStore; import org.apache.geronimo.security.deploy.PrincipalInfo; @@ -99,13 +94,13 @@ public class GeronimoSecurityBuilderImpl NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.2", "http://geronimo.apache.org/xml/ns/security-2.0"); } - private static final Map GERONIMO_SCHEMA_CONVERSIONS = new HashMap(); - - static { - GERONIMO_SCHEMA_CONVERSIONS.put("security", new SecurityElementConverter()); - GERONIMO_SCHEMA_CONVERSIONS.put("security-ref", new NamespaceElementConverter(GERONIMO_SECURITY_NAMESPACE)); - GERONIMO_SCHEMA_CONVERSIONS.put("default-subject", new NamespaceElementConverter(GERONIMO_SECURITY_NAMESPACE)); - } +// private static final Map GERONIMO_SCHEMA_CONVERSIONS = new HashMap(); +// +// static { +// GERONIMO_SCHEMA_CONVERSIONS.put("security", new SecurityElementConverter()); +// GERONIMO_SCHEMA_CONVERSIONS.put("security-ref", new NamespaceElementConverter(GERONIMO_SECURITY_NAMESPACE)); +// GERONIMO_SCHEMA_CONVERSIONS.put("default-subject", new NamespaceElementConverter(GERONIMO_SECURITY_NAMESPACE)); +// } private final AbstractNameQuery defaultCredentialStoreName; private final AbstractNameQuery defaultRoleMappingName; @@ -120,13 +115,13 @@ public class GeronimoSecurityBuilderImpl } public void doStart() { - XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES); - SchemaConversionUtils.registerNamespaceConversions(GERONIMO_SCHEMA_CONVERSIONS); +// XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES); +// SchemaConversionUtils.registerNamespaceConversions(GERONIMO_SCHEMA_CONVERSIONS); } public void doStop() { - XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES); - SchemaConversionUtils.unregisterNamespaceConversions(GERONIMO_SCHEMA_CONVERSIONS); +// XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES); +// SchemaConversionUtils.unregisterNamespaceConversions(GERONIMO_SCHEMA_CONVERSIONS); } public void doFail() { Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java Mon May 2 21:49:22 2011 @@ -35,7 +35,6 @@ import org.apache.geronimo.gbean.Abstrac import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; -import org.apache.geronimo.gbean.GReferenceInfo; import org.apache.geronimo.gbean.ReferenceMap; import org.apache.geronimo.gbean.ReferencePatterns; import org.apache.geronimo.kernel.GBeanAlreadyExistsException; @@ -223,30 +222,14 @@ public class LoginConfigBuilder { public static final GBeanInfo GBEAN_INFO; - private static final GReferenceInfo USE_REFERENCE_INFO; static { GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(LoginConfigBuilder.class, "XmlReferenceBuilder"); infoBuilder.addAttribute("kernel", Kernel.class, false, false); infoBuilder.addReference("xmlAttributeBuilders", XmlAttributeBuilder.class, "XmlAttributeBuilder"); infoBuilder.setConstructor(new String[]{"kernel", "xmlAttributeBuilders"}); - infoBuilder.addInterface(XmlReferenceBuilder.class); GBEAN_INFO = infoBuilder.getBeanInfo(); - Set referenceInfos = JaasLoginModuleUse.GBEAN_INFO.getReferences(); - GReferenceInfo found = null; - for (GReferenceInfo testReferenceInfo : referenceInfos) { - String testRefName = testReferenceInfo.getName(); - if (testRefName.equals("LoginModule")) { - found = testReferenceInfo; - break; - } - } - if (found == null) { - throw new RuntimeException("Someone changed the gbeaninfo on JaasLoginModuleUse"); - } - USE_REFERENCE_INFO = found; - } public static GBeanInfo getGBeanInfo() { Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/security/ObjectFactory.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/security/ObjectFactory.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/security/ObjectFactory.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/security/ObjectFactory.java Mon May 2 21:49:22 2011 @@ -32,7 +32,7 @@ import javax.xml.namespace.QName; public class ObjectFactory { private final static QName _CredentialStore_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "credential-store"); - private final static QName _Security_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "security"); + public final static QName _Security_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "security"); private final static QName _DefaultSubject_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "default-subject"); private final static QName _SecurityRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "security-ref"); Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/META-INF/sun-jaxb.episode URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/META-INF/sun-jaxb.episode?rev=1098802&view=auto ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/META-INF/sun-jaxb.episode (added) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/META-INF/sun-jaxb.episode Mon May 2 21:49:22 2011 @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-credential-store-1.0.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-credential-store-1.0.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-credential-store-1.0.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== (empty) Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-credential-store-1.0.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-credential-store-1.0.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-credential-store-1.0.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-jaspi.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-jaspi.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-jaspi.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== (empty) Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-jaspi.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-jaspi.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-jaspi.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-login-config-2.0.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-login-config-2.0.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-login-config-2.0.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== (empty) Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-login-config-2.0.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-login-config-2.0.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-login-config-2.0.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-security-2.0.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-security-2.0.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-security-2.0.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== (empty) Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-security-2.0.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-security-2.0.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-security-2.0.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-subject-info-1.0.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd) URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-subject-info-1.0.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-subject-info-1.0.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff ============================================================================== (empty) Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-subject-info-1.0.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-subject-info-1.0.xsd ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/main/resources/geronimo-subject-info-1.0.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java?rev=1098802&r1=1098801&r2=1098802&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java Mon May 2 21:49:22 2011 @@ -31,21 +31,17 @@ import javax.xml.stream.XMLStreamExcepti import junit.framework.TestCase; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.deployment.DeploymentContext; -import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil; import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.kernel.Jsr77Naming; -import org.apache.geronimo.kernel.osgi.MockBundleContext; -import org.apache.geronimo.kernel.config.ConfigurationModuleType; import org.apache.geronimo.kernel.config.ConfigurationData; -import org.apache.geronimo.kernel.mock.MockConfigurationManager; +import org.apache.geronimo.kernel.config.ConfigurationModuleType; +import org.apache.geronimo.kernel.osgi.MockBundleContext; import org.apache.geronimo.kernel.repository.Artifact; import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.kernel.repository.Repository; import org.apache.geronimo.security.deployment.model.JaxbUtil; import org.apache.geronimo.security.deployment.model.loginconfig.LoginConfigType; -import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlException; -import org.apache.xmlbeans.XmlObject; import org.osgi.framework.BundleContext; /**