You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/05/02 23:49:25 UTC
svn commit: r1098802 [3/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...
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/utils/WebAppXmlAttributeBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/utils/WebAppXmlAttributeBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/utils/WebAppXmlAttributeBuilder.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/utils/WebAppXmlAttributeBuilder.java Mon May 2 21:49:22 2011
@@ -26,9 +26,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler;
-import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.XmlAttributeBuilder;
import org.apache.geronimo.gbean.annotation.GBean;
@@ -36,7 +34,6 @@ import org.apache.geronimo.web25.deploym
import org.apache.geronimo.web25.deployment.WebAppInfoBuilder;
import org.apache.openejb.jee.JAXBContextFactory;
import org.apache.openejb.jee.WebApp;
-import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
/**
@@ -52,18 +49,19 @@ public class WebAppXmlAttributeBuilder i
}
@Override
- public Object getValue(XmlObject xmlObject, XmlObject enclosing, String s, Bundle bundle) throws DeploymentException {
- try {
- XMLStreamReader reader = enclosing.newXMLStreamReader();
- while (reader.hasNext() && reader.next() != 1);
- if (s.endsWith("WebAppInfo")) {
- WebApp webApp = (WebApp) unmarshalJavaee(WebApp.class, reader);
- return new WebAppInfoBuilder(webApp, new DefaultWebAppInfoFactory()).build();
- }
- throw new DeploymentException("Unrecognized xml: " + enclosing.xmlText());
- } catch (XMLStreamException e) {
- throw new DeploymentException("xml problem", e);
- }
+ public Object getValue(Object xmlObject, Object enclosing, String s, Bundle bundle) throws DeploymentException {
+ return new WebAppInfoBuilder((WebApp)xmlObject, new DefaultWebAppInfoFactory()).build();
+// try {
+// XMLStreamReader reader = enclosing.newXMLStreamReader();
+// while (reader.hasNext() && reader.next() != 1);
+// if (s.endsWith("WebAppInfo")) {
+// WebApp webApp = (WebApp) unmarshalJavaee(WebApp.class, reader);
+// return new WebAppInfoBuilder(webApp, new DefaultWebAppInfoFactory()).build();
+// }
+// throw new DeploymentException("Unrecognized xml: " + enclosing.xmlText());
+// } catch (XMLStreamException e) {
+// throw new DeploymentException("xml problem", e);
+// }
}
public static <T>Object unmarshalJavaee(Class<T> type, XMLStreamReader in) throws DeploymentException {
Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/META-INF/sun-jaxb.episode
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/META-INF/sun-jaxb.episode?rev=1098802&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/META-INF/sun-jaxb.episode (added)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/META-INF/sun-jaxb.episode Mon May 2 21:49:22 2011
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bindings version="2.1" xmlns="http://java.sun.com/xml/ns/jaxb">
+ <!--
+
+This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2
+See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+Any modifications to this file will be lost upon recompilation of the source schema.
+Generated on: 2011.04.27 at 07:52:24 PM PDT
+
+ -->
+ <bindings scd="x-schema::tns" xmlns:tns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <schemaBindings map="false"/>
+ <bindings scd="~tns:web-appType">
+ <class ref="org.apache.geronimo.web25.deployment.model.WebAppType"/>
+ </bindings>
+ <bindings scd="~tns:container-configType">
+ <class ref="org.apache.geronimo.web25.deployment.model.ContainerConfigType"/>
+ </bindings>
+ <bindings scd="~tns:authenticationType">
+ <class ref="org.apache.geronimo.web25.deployment.model.AuthenticationType"/>
+ </bindings>
+ </bindings>
+</bindings>
+
Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/catalog.cat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/catalog.cat?rev=1098802&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/catalog.cat (added)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/catalog.cat Mon May 2 21:49:22 2011
@@ -0,0 +1,17 @@
+PUBLIC "http://geronimo.apache.org/xml/ns/deployment-1.2" "classpath:geronimo-module-1.2.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/naming-1.2" "classpath:geronimo-naming-1.2.xsd"
+--
+PUBLIC "http://geronimo.apache.org/xml/ns/j2ee/application-2.0" "classpath:geronimo-application-2.0.xsd"
+--
+PUBLIC "http://geronimo.apache.org/xml/ns/geronimo-jaspi" "classpath:geronimo-jaspi.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/credentialstore-1.0" "classpath:geronimo-credential-store-1.0.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/loginconfig-2.0" "classpath:geronimo-login-config-2.0.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/security-2.0" "classpath:geronimo-security-2.0.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/subject-info-1.0" "classpath:geronimo-subject-info.1.0.xsd"
+
+
Copied: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd (from r1096963, geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd&r1=1096963&r2=1098802&rev=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd Mon May 2 21:49:22 2011
@@ -23,19 +23,26 @@
xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:jaspi="http://geronimo.apache.org/xml/ns/geronimo-jaspi"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
- <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/geronimo-jaspi" schemaLocation="geronimo-jaspi.xsd"/>
-
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2"/>
+ <!-- xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+-->
+ <!--<xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"/>-->
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/geronimo-jaspi"/>
+ <!-- these might not be used -->
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/credentialstore-1.0"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/loginconfig-2.0"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/security-2.0"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/subject-info-1.0"/>
+
<xs:element name="web-app" type="web:web-appType"/>
<xs:annotation>
<xs:documentation>
@@ -78,8 +85,14 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <!--<xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>-->
- <xs:element ref="naming:web-container" minOccurs="0"/>
+ <xs:element name="web-container" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ osgi filter to select the web container service to deploy to, should there be more than one.
+ TODO may not be needed due to isolation?
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="container-config" type="web:container-configType" minOccurs="0">
<xs:annotation>
<xs:documentation>
@@ -104,27 +117,17 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="app:security" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element ref="sec:security"/>
+ <xs:element ref="sec:security-ref"/>
+ </xs:choice>
</xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>
- Reference to abstract service element defined in imported
- "geronimo-module-1.2.xsd"
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:any namespace="http://java.sun.com/xml/ns/persistence"/>
- </xs:choice>
-
-
</xs:sequence>
</xs:complexType>
<xs:complexType name="authenticationType">
- <xs:choice minOccurs="0">
+ <xs:choice>
<xs:element ref="jaspi:configProvider"/>
<xs:element ref="jaspi:serverAuthConfig"/>
<xs:element ref="jaspi:serverAuthContext"/>
Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/resources/geronimo-web-2.0.1.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java Mon May 2 21:49:22 2011
@@ -16,25 +16,13 @@
*/
package org.apache.geronimo.web.deployment;
-import java.net.URL;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-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.deployment.GeronimoSecurityBuilderImpl;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-
/**
* @version $Rev$ $Date$
*/
@@ -42,10 +30,10 @@ public class GenericToSpecificPlanConver
private ClassLoader classLoader = this.getClass().getClassLoader();
protected void setUp() {
- Map<String, ElementConverter> converterMap = new HashMap<String, ElementConverter>();
- converterMap.put("security", new SecurityElementConverter());
- converterMap.put("default-subject", new NamespaceElementConverter(GeronimoSecurityBuilderImpl.GERONIMO_SECURITY_NAMESPACE));
- SchemaConversionUtils.registerNamespaceConversions(converterMap);
+// Map<String, ElementConverter> converterMap = new HashMap<String, ElementConverter>();
+// converterMap.put("security", new SecurityElementConverter());
+// converterMap.put("default-subject", new NamespaceElementConverter(GeronimoSecurityBuilderImpl.GERONIMO_SECURITY_NAMESPACE));
+// SchemaConversionUtils.registerNamespaceConversions(converterMap);
}
public void testConvertPlan1() throws Exception {
@@ -65,53 +53,54 @@ public class GenericToSpecificPlanConver
}
public void testConvertPlan(String prePlanName, String postPlanName) throws Exception {
- URL srcXml = classLoader.getResource(prePlanName);
- URL expectedOutputXml = classLoader.getResource(postPlanName);
- XmlObject rawPlan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
-
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",
- "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1", "tomcat").convertToSpecificPlan(rawPlan);
-
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(webPlan, expected, problems);
- assertTrue("Differences: " + problems, ok);
- }
-
- private boolean compareXmlObjects(XmlObject xmlObject, XmlObject expectedObject, List problems) {
- XmlCursor test = xmlObject.newCursor();
- XmlCursor expected = expectedObject.newCursor();
- boolean similar = true;
- int elementCount = 0;
- while (toNextStartToken(test)) {
- elementCount++;
- if (!toNextStartToken(expected)) {
- problems.add("test longer than expected at element: " + elementCount);
- return false;
- }
- QName actualChars = test.getName();
- QName expectedChars = expected.getName();
- if (!actualChars.equals(expectedChars)) {
- problems.add("Different elements at elementCount: " + elementCount + ", test: " + actualChars + ", expected: " + expectedChars);
- similar = false;
- }
- test.toNextToken();
- expected.toNextToken();
- }
- if (toNextStartToken(expected)) {
- problems.add("test shorter that expected at element: " + elementCount);
- similar = false;
- }
- return similar;
- }
-
- private boolean toNextStartToken(XmlCursor cursor) {
- while (!cursor.isStart()) {
- if (!cursor.hasNextToken()) {
- return false;
- }
- cursor.toNextToken();
- }
- return true;
- }
+ //TODO consider reimplementing
+// URL srcXml = classLoader.getResource(prePlanName);
+// URL expectedOutputXml = classLoader.getResource(postPlanName);
+// XmlObject rawPlan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
+//
+// XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+// XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",
+// "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1", "tomcat").convertToSpecificPlan(rawPlan);
+//
+// List problems = new ArrayList();
+// boolean ok = compareXmlObjects(webPlan, expected, problems);
+// assertTrue("Differences: " + problems, ok);
+ }
+
+// private boolean compareXmlObjects(XmlObject xmlObject, XmlObject expectedObject, List problems) {
+// XmlCursor test = xmlObject.newCursor();
+// XmlCursor expected = expectedObject.newCursor();
+// boolean similar = true;
+// int elementCount = 0;
+// while (toNextStartToken(test)) {
+// elementCount++;
+// if (!toNextStartToken(expected)) {
+// problems.add("test longer than expected at element: " + elementCount);
+// return false;
+// }
+// QName actualChars = test.getName();
+// QName expectedChars = expected.getName();
+// if (!actualChars.equals(expectedChars)) {
+// problems.add("Different elements at elementCount: " + elementCount + ", test: " + actualChars + ", expected: " + expectedChars);
+// similar = false;
+// }
+// test.toNextToken();
+// expected.toNextToken();
+// }
+// if (toNextStartToken(expected)) {
+// problems.add("test shorter that expected at element: " + elementCount);
+// similar = false;
+// }
+// return similar;
+// }
+
+// private boolean toNextStartToken(XmlCursor cursor) {
+// while (!cursor.isStart()) {
+// if (!cursor.hasNextToken()) {
+// return false;
+// }
+// cursor.toNextToken();
+// }
+// return true;
+// }
}
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web/pom.xml Mon May 2 21:49:22 2011
@@ -78,12 +78,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions>
- <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
- <Import-Package>
- *
- </Import-Package>
- </instructions>
+ <!--<instructions> -->
+ <!--<Import-Package>-->
+ <!--*-->
+ <!--</Import-Package>-->
+ <!--</instructions>-->
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml Mon May 2 21:49:22 2011
@@ -39,33 +39,130 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
+ <artifactId>geronimo-naming</artifactId>
<version>${project.version}</version>
- <type>car</type>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
<version>${project.version}</version>
</dependency>
<!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>server-security-config</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-j2ee-schema</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
<!--<groupId>org.apache.geronimo.schema</groupId>-->
<!--<artifactId>geronimo-schema-javaee_6</artifactId>-->
<!--</dependency>-->
@@ -86,41 +183,98 @@
<!--<version>${project.version}</version>-->
<!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-test-ddbean</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-security</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-2.5-builder</artifactId>
+ <artifactId>geronimo-security-builder</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-naming</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
+ <artifactId>geronimo-naming-builder</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+ <!--TODO can this be optional? -->
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>scannotation</artifactId>
+ </dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
</dependency>
+
</dependencies>
<build>
@@ -163,20 +317,20 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<category>JavaEE deployment</category>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
- </dependencies>
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>j2ee-server</artifactId>-->
+ <!--<type>car</type>-->
+ <!--<import>classes</import>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>server-security-config</artifactId>-->
+ <!--<type>car</type>-->
+ <!--<import>classes</import>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
<instance>
<plugin-artifact>
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Mon May 2 21:49:22 2011
@@ -32,14 +32,14 @@
<reference name="WebConfigBuilder">
<name>WebBuilder</name>
</reference>
- <references name="ServiceBuilders">
- <pattern>
- <name>GBeanBuilder</name>
- </pattern>
- <pattern>
- <name>SecurityBuilder</name>
- </pattern>
- </references>
+ <!--<references name="ServiceBuilders">-->
+ <!--<pattern>-->
+ <!--<name>GBeanBuilder</name>-->
+ <!--</pattern>-->
+ <!--<pattern>-->
+ <!--<name>SecurityBuilder</name>-->
+ <!--</pattern>-->
+ <!--</references>-->
<references name="BValModuleBuilders">
<pattern>
<name>BValModuleBuilderExtension</name>
@@ -75,17 +75,17 @@
<reference name="ArtifactResolvers">
<name>ArtifactResolver</name>
</reference>
- <xml-attribute name="defaultEnvironment">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>j2ee-server</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
+ <!--<xml-attribute name="defaultEnvironment">-->
+ <!--<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>${pom.groupId}</groupId>-->
+ <!--<artifactId>j2ee-server</artifactId>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</environment>-->
+ <!--</xml-attribute>-->
</gbean>
<!-- web switching builder -->
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/javaee-builder-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/javaee-builder-support/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/javaee-builder-support/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/javaee-builder-support/pom.xml Mon May 2 21:49:22 2011
@@ -39,11 +39,121 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <artifactId>geronimo-naming</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
<version>${project.version}</version>
- <type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.schema</groupId>-->
@@ -66,14 +176,29 @@
<!--<version>${project.version}</version>-->
<!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-naming-builder</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-web-2.5-builder</artifactId>
<version>${project.version}</version>
</dependency>
@@ -101,6 +226,61 @@
<!--<groupId>org.apache.xbean</groupId>-->
<!--<artifactId>xbean-finder</artifactId>-->
<!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+ <!--TODO can this be optional? -->
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>scannotation</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml Mon May 2 21:49:22 2011
@@ -20,6 +20,6 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+ <!--<gbean name="WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>-->
</module>
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/pom.xml Mon May 2 21:49:22 2011
@@ -39,17 +39,17 @@
<module>geronimo-j2ee-builder</module>
<module>javaee-builder-support</module>
<module>j2ee-deployer</module>
- <module>geronimo-j2ee-schema</module>
+ <!--<module>geronimo-j2ee-schema</module>-->
<module>geronimo-naming-builder</module>
<module>geronimo-security-builder</module>
- <module>geronimo-test-ddbean</module>
+ <!--<module>geronimo-test-ddbean</module>-->
<module>geronimo-web</module>
<module>geronimo-web-2.5-builder</module>
<module>j2ee-server</module>
- <module>jsr88-ear-configurer</module>
- <module>jsr88-jar-configurer</module>
- <module>jsr88-rar-configurer</module>
- <module>jsr88-war-configurer</module>
+ <!--<module>jsr88-ear-configurer</module>-->
+ <!--<module>jsr88-jar-configurer</module>-->
+ <!--<module>jsr88-rar-configurer</module>-->
+ <!--<module>jsr88-war-configurer</module>-->
</modules>
Modified: geronimo/server/branches/3.0-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/pom.xml Mon May 2 21:49:22 2011
@@ -1979,7 +1979,19 @@
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ <version>${sxcVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ <version>${sxcVersion}</version>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
@@ -2371,6 +2383,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>0.7.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <specVersion>2.1</specVersion>
+ <extension>true</extension>
+ <episode>true</episode>
+ <!--<schemaDirectory>src/main/xsd</schemaDirectory>-->
+ <catalog>src/main/resources/catalog.cat</catalog>
+ <catalogResolver>org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver</catalogResolver>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>