Author: pete.muir(a)jboss.org Date: 2010-05-28 08:41:45 -0400 (Fri, 28 May 2010) New Revision: 12890 Added: modules/xml/trunk/examples/princess-rescue/src/main/resources/jetty-env.xml Removed: modules/xml/trunk/examples/princess-rescue/src/test/resources/jetty-env.xml Modified: modules/xml/trunk/examples/princess-rescue/pom.xml modules/xml/trunk/pom.xml Log: clean ups to POM as a result of weld-parent:10 Modified: modules/xml/trunk/examples/princess-rescue/pom.xml =================================================================== --- modules/xml/trunk/examples/princess-rescue/pom.xml 2010-05-28 12:39:41 UTC (rev 12889) +++ modules/xml/trunk/examples/princess-rescue/pom.xml 2010-05-28 12:41:45 UTC (rev 12890) @@ -131,28 +131,6 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> - <configuration> - <!-- Delete this block to have Jetty run default port (8080) --> - <connectors> - <connector - implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>9090</port> - </connector> - </connectors> - <!-- force friendly name instead of artifact name + version --> - <contextPath>${project.build.finalName}</contextPath> - <!-- - Where the BeanManager is constructed. This is where - you'll declare datasources. - --> - <jettyEnvXml>${basedir}/src/test/resources/jetty-env.xml</jettyEnvXml> - <!-- This parameter will auto-deploy modified classes. --> - <!-- - You can save changes in a file or class and refresh - your browser to view the changes. - --> - <scanIntervalSeconds>3</scanIntervalSeconds> - </configuration> </plugin> <!-- Embedded Tomcat (package tomcat:run) --> @@ -160,18 +138,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>tomcat-maven-plugin</artifactId> - <configuration> - <path>/${project.build.finalName}</path> - <!-- Embedded port --> - <port>9090</port> - <!-- - The default authentication credentials for remote - deployment are username "admin" with no password To - override credentials, define a server in settings.xml - and activate it using the <server> element - --> - <url>http://localhost:8080/manager</url> - </configuration> </plugin> </plugins> </build> Copied: modules/xml/trunk/examples/princess-rescue/src/main/resources/jetty-env.xml (from rev 12868, modules/xml/trunk/examples/princess-rescue/src/test/resources/jetty-env.xml) =================================================================== --- modules/xml/trunk/examples/princess-rescue/src/main/resources/jetty-env.xml (rev 0) +++ modules/xml/trunk/examples/princess-rescue/src/main/resources/jetty-env.xml 2010-05-28 12:41:45 UTC (rev 12890) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> +<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext"> + <New id="beanManager" class="org.mortbay.jetty.plus.naming.Resource"> + <Arg> + <Ref id="webAppCtx"/> + </Arg> + <Arg>BeanManager</Arg> + <Arg> + <New class="javax.naming.Reference"> + <Arg>javax.enterprise.inject.spi.BeanManager</Arg> + <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg> + <Arg/> + </New> + </Arg> + </New> +</Configure> Deleted: modules/xml/trunk/examples/princess-rescue/src/test/resources/jetty-env.xml =================================================================== --- modules/xml/trunk/examples/princess-rescue/src/test/resources/jetty-env.xml 2010-05-28 12:39:41 UTC (rev 12889) +++ modules/xml/trunk/examples/princess-rescue/src/test/resources/jetty-env.xml 2010-05-28 12:41:45 UTC (rev 12890) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> -<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext"> - <New id="beanManager" class="org.mortbay.jetty.plus.naming.Resource"> - <Arg> - <Ref id="webAppCtx"/> - </Arg> - <Arg>BeanManager</Arg> - <Arg> - <New class="javax.naming.Reference"> - <Arg>javax.enterprise.inject.spi.BeanManager</Arg> - <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg> - <Arg/> - </New> - </Arg> - </New> -</Configure> Modified: modules/xml/trunk/pom.xml =================================================================== --- modules/xml/trunk/pom.xml 2010-05-28 12:39:41 UTC (rev 12889) +++ modules/xml/trunk/pom.xml 2010-05-28 12:41:45 UTC (rev 12890) @@ -5,7 +5,7 @@ <parent> <artifactId>weld-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>9</version> + <version>10</version> </parent> <groupId>org.jboss.seam.xml</groupId> @@ -21,15 +21,11 @@ </modules> <build> + <finalName>seam-xml-config-${pom.version}</finalName> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <finalName>seam-xml-config-${pom.version}</finalName> - </configuration> </plugin> </plugins> </build>