geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1098803 [3/3] - in /geronimo/server/branches/3.0-osgi: ./ plugins/ plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/jaspi/ plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/ger...
Date Mon, 02 May 2011 21:49:46 GMT
Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=1098803&r1=1098802&r2=1098803&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
Mon May  2 21:49:44 2011
@@ -20,18 +20,23 @@ import java.io.File;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Map;
 
+import javax.xml.namespace.QName;
 import junit.framework.TestCase;
 
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
 import org.apache.geronimo.deployment.service.GBeanBuilder;
-import org.apache.geronimo.deployment.xbeans.ArtifactType;
-import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.service.plan.ArtifactType;
+import org.apache.geronimo.deployment.service.plan.EnvironmentType;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
+import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceRefType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.kernel.Naming;
@@ -39,14 +44,13 @@ import org.apache.geronimo.kernel.osgi.M
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
+import org.apache.geronimo.tomcat.deployment.model.TomcatConfigType;
 import org.apache.geronimo.web.deployment.GenericToSpecificPlanConverter;
 import org.apache.geronimo.web.info.WebAppInfo;
-import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
-import org.apache.geronimo.xbeans.geronimo.web.tomcat.TomcatWebAppType;
-import org.apache.xmlbeans.XmlObject;
+import org.apache.geronimo.web25.deployment.model.ObjectFactory;
+import org.apache.geronimo.web25.deployment.model.WebAppType;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
 import org.osgi.service.packageadmin.ExportedPackage;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.packageadmin.RequiredBundle;
@@ -66,7 +70,7 @@ public class PlanParsingTest extends Tes
     private TomcatModuleBuilder builder;
 
     protected void setUp() throws Exception {
-        MockBundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(),
"", null, null);
+        BundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(),
"", null, null);
         PackageAdmin packageAdmin = new PackageAdmin() {
 
                 @Override
@@ -124,12 +128,13 @@ public class PlanParsingTest extends Tes
                 }
             };
         bundleContext.registerService(PackageAdmin.class.getName(), packageAdmin, null);
-        builder = new TomcatModuleBuilder(defaultEnvironment,
+        builder = new TomcatModuleBuilder(
                 tomcatContainerObjectName,
                 new WebAppInfo(),
                 null,
                 Collections.singleton(webServiceBuilder),
-                Arrays.asList(new GBeanBuilder(null, null), new GeronimoSecurityBuilderImpl(null,
null, null)),
+//                Arrays.<NamespaceDrivenBuilder>asList(new GBeanBuilder(null, null),
new GeronimoSecurityBuilderImpl(null, null, null)),
+                Collections.<NamespaceDrivenBuilder>singletonList(new GeronimoSecurityBuilderImpl(null,
null, null)),
                 new NamingBuilderCollection(null),
                 Collections.EMPTY_LIST,
                 null,
@@ -147,14 +152,14 @@ public class PlanParsingTest extends Tes
 
     public void testConvertPlan() throws Exception {
         URL srcXml = classLoader.getResource("plans/plan-convert.xml");
-        XmlObject rawPlan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
-
-        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);
-
-        XmlObject p = webPlan.changeType(TomcatWebAppType.type);
+//        XmlObject rawPlan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
+//
+//        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);
+//
+//        XmlObject p = webPlan.changeType(TomcatWebAppType.type);
         //TODO WTF? no changes but it fails run from maven, not from idea.
 //        XmlBeansUtil.validateDD(p);
     }
@@ -163,30 +168,32 @@ public class PlanParsingTest extends Tes
         URL resourceURL = classLoader.getResource("plans/plan1.xml");
         File resourcePlan = new File(resourceURL.getFile());
         assertTrue(resourcePlan.exists());
-        TomcatWebAppType tomcatWebApp = builder.getTomcatWebApp(resourcePlan, null, true,
null, null);
-        assertEquals(1, tomcatWebApp.getResourceRefArray().length);
+        WebAppType tomcatWebApp = builder.getTomcatWebApp(resourcePlan, null, true, null,
null);
+        assertEquals(1, tomcatWebApp.getResourceRef().size());
     }
 
     public void testConstructPlan() throws Exception {
-        GerWebAppDocument tomcatWebAppDoc = GerWebAppDocument.Factory.newInstance();
-        GerWebAppType tomcatWebAppType = tomcatWebAppDoc.addNewWebApp();
-        EnvironmentType environmentType = tomcatWebAppType.addNewEnvironment();
-        ArtifactType artifactType = environmentType.addNewModuleId();
+        WebAppType tomcatWebAppType = new ObjectFactory().createWebAppType();
+        EnvironmentType environmentType = new EnvironmentType();
+        tomcatWebAppType.setEnvironment(environmentType);
+        ArtifactType artifactType = new ArtifactType();
         artifactType.setArtifactId("foo");
+        environmentType.setModuleId(artifactType);
 
-        GerResourceRefType ref = tomcatWebAppType.addNewResourceRef();
+        ResourceRefType ref = new ResourceRefType();
         ref.setRefName("ref");
         ref.setResourceLink("target");
+        tomcatWebAppType.getResourceRef().add(ref);
 
-        XmlBeansUtil.validateDD(tomcatWebAppType);
+//        XmlBeansUtil.validateDD(tomcatWebAppType);
     }
 
     public void testContextAttributes() throws Exception {
         URL resourceURL = classLoader.getResource("plans/plan-context.xml");
         File resourcePlan = new File(resourceURL.getFile());
         assertTrue(resourcePlan.exists());
-        TomcatWebAppType tomcatWebApp = builder.getTomcatWebApp(resourcePlan, null, true,
null, null);
-        NamedNodeMap  namedNodeMap = tomcatWebApp.getContext().getDomNode().getAttributes();
-        assertEquals(2, namedNodeMap.getLength());
+        WebAppType tomcatWebApp = builder.getTomcatWebApp(resourcePlan, null, true, null,
null);
+        Map<QName, String> other = ((TomcatConfigType)tomcatWebApp.getContainerConfig()).getContext().getOtherAttributes();
+        assertEquals(2, other.size());
     }
 }

Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=1098803&r1=1098802&r2=1098803&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Mon May  2 21:49:44 2011
@@ -42,15 +42,10 @@ import org.apache.geronimo.kernel.Kernel
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ArtifactManager;
-import org.apache.geronimo.kernel.repository.ArtifactResolver;
-import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
-import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.util.UnpackedJarFile;
@@ -76,7 +71,6 @@ public class TomcatModuleBuilderTest ext
     private TomcatModuleBuilder builder;
     private Artifact webModuleArtifact = new Artifact("foo", "bar", "1", "car");
     private Environment defaultEnvironment = new Environment();
-    private ConfigurationManager configurationManager;
     private ConfigurationStore configStore;
     private AbstractName baseRootName = naming.createRootName(baseId, "root", NameFactory.SERVICE_MODULE);
     private AbstractNameQuery credentialStoreName = new AbstractNameQuery(naming.createChildName(baseRootName,
"CredentialStore", GBeanInfoBuilder.DEFAULT_J2EE_TYPE));
@@ -151,30 +145,26 @@ public class TomcatModuleBuilderTest ext
         earContext.close();
         module.close();
 
-        Artifact configurationId = configurationData.getId();
-        configurationManager.loadConfiguration(configurationData);
-        Configuration configuration = configurationManager.getConfiguration(configurationId);
-        configurationManager.startConfiguration(configurationId);
-
+//        Artifact configurationId = configurationData.getId();
+//        configurationManager.loadConfiguration(configurationData);
+//        Configuration configuration = configurationManager.getConfiguration(configurationId);
+//        configurationManager.startConfiguration(configurationId);
+        //TODO create it
+        Configuration configuration = null;
         return new WebModuleInfo(moduleName, configuration);
     }
 
     private void undeployWar(Configuration configuration) throws Exception {
-        configurationManager.stopConfiguration(configuration.getId());
-        configurationManager.unloadConfiguration(configuration.getId());
+//        configurationManager.stopConfiguration(configuration.getId());
+//        configurationManager.unloadConfiguration(configuration.getId());
     }
 
     private EARContext createEARContext(File outputPath, Environment environment, Repository
repository, ConfigurationStore configStore, AbstractName moduleName) throws DeploymentException
{
-        Set repositories = repository == null ? Collections.EMPTY_SET : Collections.singleton(repository);
-        Set configurationManagers = configurationManager == null ? Collections.EMPTY_SET
: Collections.singleton(configurationManager);
-        ArtifactManager artifactManager = new DefaultArtifactManager();
-        ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager,
repositories, null, configurationManagers);
         return new EARContext(outputPath,
                 null,
                 environment,
                 ConfigurationModuleType.WAR,
                 naming,
-                configurationManager,
                 bundle.getBundleContext(),
                 new AbstractNameQuery(serverName),
                 moduleName,

Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/resources/plans/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/resources/plans/plan1.xml?rev=1098803&r1=1098802&r2=1098803&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/resources/plans/plan1.xml
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7-builder/src/test/resources/plans/plan1.xml
Mon May  2 21:49:44 2011
@@ -16,8 +16,8 @@
    limitations under the License.
 -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
-    <environment>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
@@ -26,7 +26,7 @@
         </moduleId>
     </environment>
     <security-realm-name>public-properties-realm</security-realm-name>
-    <security default-role="UNASSIGNED" doas-current-caller="true">
+    <security default-role="UNASSIGNED" doas-current-caller="true" xmlns="http://geronimo.apache.org/xml/ns/security-2.0">
         <default-principal>
             <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
         </default-principal>
@@ -53,7 +53,7 @@
             </role>
         </role-mappings>
     </security>
-    <resource-ref>
+    <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming-1.2">
         <ref-name>jdbc/DB1</ref-name>
         <resource-link>DefaultDatabase</resource-link>
     </resource-ref>

Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=1098803&r1=1098802&r2=1098803&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Mon May  2 21:49:44 2011
@@ -241,7 +241,7 @@ public class TomcatManagerImpl implement
     /**
      * Removes a connector.  This shuts it down if necessary, and removes it from the server
environment.  It must be a
      * connector that uses this network technology.
-     * @param connectorName
+     * @param connectorAbstractName
      */
     public void removeConnector(AbstractName connectorAbstractName) {
 
@@ -325,7 +325,7 @@ public class TomcatManagerImpl implement
         gbeanData.setReferencePattern("ServerInfo", serverInfo);
 
         try {
-            kernel.loadGBean(gbeanData, container.getBundleContext());
+            kernel.loadGBean(gbeanData, container.getBundleContext().getBundle());
             kernel.startGBean(name);
         } catch (Exception e) {
             log.error("Error when adding new tomcat connector" + uniqueName, e);

Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java?rev=1098803&r1=1098802&r2=1098803&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java
Mon May  2 21:49:44 2011
@@ -37,7 +37,7 @@ import org.apache.geronimo.kernel.Kernel
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.tomcat.TomcatContainer;
 import org.apache.geronimo.tomcat.TomcatServerGBean;
-import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,23 +53,23 @@ public class ConnectorWrapperGBeanStarte
     private static final Logger log = LoggerFactory.getLogger(ConnectorWrapperGBeanStarter.class);
     private final TomcatServerGBean server;
     private final TomcatContainer container;
-    private final BundleContext bundleContext;
+    private final Bundle bundle;
     private final Kernel kernel;
 
     public ConnectorWrapperGBeanStarter(
             @ParamReference(name = "Server") TomcatServerGBean server,
             @ParamReference(name = "TomcatContainer") TomcatContainer container,
-            @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext,
+            @ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle,
             @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel) throws Exception
{
 
         this.server = server;
         this.container = container;
-        this.bundleContext = bundleContext;
+        this.bundle = bundle;
         this.kernel = kernel;
 
     }
 
-    private void buildConnectorGBean(BundleContext context, Kernel kernel, Connector conn,
TomcatContainer container) {
+    private void buildConnectorGBean(Bundle bundle, Kernel kernel, Connector conn, TomcatContainer
container) {
 
         GBeanInfo gbeanInfo = this.getConnectorGBeanInfo(conn);
 
@@ -101,7 +101,7 @@ public class ConnectorWrapperGBeanStarte
         gbeanData.setReferencePattern("ServerInfo", set.iterator().next());
 
         try {
-            kernel.loadGBean(gbeanData, context);
+            kernel.loadGBean(gbeanData, bundle);
             kernel.startGBean(name);
         } catch (Exception e) {
             log.error("Error when building connectorGbean for connector: " + conn.getAttribute("address")
+ ":"
@@ -173,7 +173,7 @@ public class ConnectorWrapperGBeanStarte
 
         for (Connector conn : connectors) {
 
-            this.buildConnectorGBean(bundleContext, kernel, conn, container);
+            this.buildConnectorGBean(bundle, kernel, conn, container);
         }
     }
 

Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml?rev=1098803&r1=1098802&r2=1098803&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml Mon May  2 21:49:44 2011
@@ -36,14 +36,22 @@
     <description>Geronimo Tomcat web server integration.</description>
 
     <dependencies>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
+
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_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>
@@ -52,7 +60,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
+            <groupId>org.apache.geronimo.framework.config</groupId>
             <artifactId>server-security-config</artifactId>
             <version>${project.version}</version>
             <type>car</type>
@@ -107,10 +115,10 @@
         </dependency>
 
         <!-- Check whether we really need this dependency-->  
-        <dependency>
-            <groupId>org.apache.geronimo.javamail</groupId>
-            <artifactId>geronimo-javamail_1.4_mail</artifactId>             
  
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.javamail</groupId>-->
+            <!--<artifactId>geronimo-javamail_1.4_mail</artifactId>      
         -->
+        <!--</dependency>-->
     </dependencies>
 
     <build>

Modified: geronimo/server/branches/3.0-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/pom.xml?rev=1098803&r1=1098802&r2=1098803&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/pom.xml Mon May  2 21:49:44 2011
@@ -456,12 +456,12 @@
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
-                <version>1.1.2-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
-                <version>1.1.2-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <classifier>tests</classifier>
             </dependency>
 
@@ -2384,25 +2384,25 @@
                     </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>
+                    <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>



Mime
View raw message