Author: chris.laprun(a)jboss.com Date: 2009-07-28 07:43:32 -0400 (Tue, 28 Jul 2009) New Revision: 13606 Added: modules/wsrp/trunk/package/ modules/wsrp/trunk/package/pom.xml modules/wsrp/trunk/package/src/ modules/wsrp/trunk/package/src/assemble/ modules/wsrp/trunk/package/src/assemble/wsrp-producer-jboss42.xml modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/context.xml Modified: modules/wsrp/trunk/pom.xml modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/web.xml modules/wsrp/trunk/service/pom.xml modules/wsrp/trunk/service/src/main/resources/META-INF/jboss-service.xml Log: - JBPORTAL-2186: Backup commit mostly. + Added package module to try to output something that would satisfy JBoss' classloader. >_< + Added ContainerServlet to Producer + priviledged context for that servlet to work properly. + Inject ServletContainerFactory instead of injecting ServletContainer and make sure that ContextDispatchInterceptor uses it. Added: modules/wsrp/trunk/package/pom.xml =================================================================== --- modules/wsrp/trunk/package/pom.xml (rev 0) +++ modules/wsrp/trunk/package/pom.xml 2009-07-28 11:43:32 UTC (rev 13606) @@ -0,0 +1,74 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal.wsrp</groupId> + <artifactId>module-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../build/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>package</artifactId> + <name>JBoss WSRP Producer packaging</name> + + <dependencies> + + <!--<dependency> + <groupId>org.jboss.portal.wsrp</groupId> + <artifactId>wsrp-service</artifactId> + <type>jboss-sar</type> + <version>${project.version}</version> + </dependency>--> + + <dependency> + <groupId>org.jboss.portal.web</groupId> + <artifactId>web-web</artifactId> + <version>${version.web}</version> + </dependency> + + <dependency> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-portlet</artifactId> + <version>${version.portlet}</version> + </dependency> + + <dependency> + <groupId>javax.ccpp</groupId> + <artifactId>ccpp</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> + + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>wsrp-producer</finalName> + <descriptors> + <descriptor>src/assemble/wsrp-producer-jboss42.xml</descriptor> + <!--<descriptor>src/assemble/wsrp-producer-tomcat60.xml</descriptor> + <descriptor>src/assemble/wsrp-producer-jboss50.xml</descriptor>--> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + +</project> Added: modules/wsrp/trunk/package/src/assemble/wsrp-producer-jboss42.xml =================================================================== --- modules/wsrp/trunk/package/src/assemble/wsrp-producer-jboss42.xml (rev 0) +++ modules/wsrp/trunk/package/src/assemble/wsrp-producer-jboss42.xml 2009-07-28 11:43:32 UTC (rev 13606) @@ -0,0 +1,56 @@ +<assembly> + <id>jboss42</id> + <formats> + <format>dir</format> + </formats> + <baseDirectory>wsrp-producer</baseDirectory> + + <!--<componentDescriptors> + <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor> + </componentDescriptors>--> + + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + + <include>org.jboss.portal.common:common-common</include> + <include>org.jboss.portal.common:common-portal</include> + <include>org.jboss.portal.web:web-web</include> + <include>org.jboss.portal.portlet:portlet-portlet</include> + + <include>javax.ccpp:ccpp</include> + <include>javax.portlet:portlet-api</include> + + </includes> + </dependencySet> + + <!-- <dependencySet> + <outputDirectory></outputDirectory> + <includes> + <include>org.jboss.portal.wsrp:wsrp-service</include> + </includes> + </dependencySet>--> + + </dependencySets> + + <files> + <file> + <source>../service/target/wsrp-producer.sar</source> + <outputDirectory></outputDirectory> + </file> + </files> + + <!--<moduleSets> + <moduleSet> + <includes> + <include>org.jboss.portal.wsrp:*</include> + </includes> + <binaries> + <outputDirectory></outputDirectory> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets>--> + +</assembly> Modified: modules/wsrp/trunk/pom.xml =================================================================== --- modules/wsrp/trunk/pom.xml 2009-07-27 15:50:05 UTC (rev 13605) +++ modules/wsrp/trunk/pom.xml 2009-07-28 11:43:32 UTC (rev 13606) @@ -52,50 +52,11 @@ <module>api</module> <module>wsrp1-rpc</module> <module>core</module> - <module>producer</module> <module>test-support</module> - <module>admin-gui</module> + <module>producer</module> + <!--<module>consumer</module> + <module>admin-gui</module>--> <module>service</module> + <module>package</module> </modules> - - <!--<build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - <executions> - <execution> - <id>copy-portal-jopr-plugin-jar</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.portal.jopr</groupId> - <artifactId>portal-management</artifactId> - <version>${project.version}</version> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.0-beta-1</version> - - &lt;!&ndash; Enable packaging types and lifecycle bindings. &ndash;&gt; - <extensions>true</extensions> - <configuration> - <excludeAll>true</excludeAll> - <primaryArtifact>false</primaryArtifact> - </configuration> - </plugin> - </plugins> - </build>--> </project> \ No newline at end of file Added: modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/context.xml =================================================================== --- modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/context.xml (rev 0) +++ modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/context.xml 2009-07-28 11:43:32 UTC (rev 13606) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context privileged="true"/> \ No newline at end of file Modified: modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/web.xml =================================================================== --- modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/web.xml 2009-07-27 15:50:05 UTC (rev 13605) +++ modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/web.xml 2009-07-28 11:43:32 UTC (rev 13606) @@ -47,6 +47,14 @@ <url-pattern>/*</url-pattern> </filter-mapping> + <!-- To listen to portlet deployments --> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <!-- WSRP Endpoints --> <servlet> <servlet-name>ServiceDescriptionService</servlet-name> Modified: modules/wsrp/trunk/service/pom.xml =================================================================== --- modules/wsrp/trunk/service/pom.xml 2009-07-27 15:50:05 UTC (rev 13605) +++ modules/wsrp/trunk/service/pom.xml 2009-07-28 11:43:32 UTC (rev 13606) @@ -148,6 +148,8 @@ <artifactId>ccpp</artifactId> <version>1.0</version> </artifactItem> + + <!-- hibernate --> <artifactItem> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> Modified: modules/wsrp/trunk/service/src/main/resources/META-INF/jboss-service.xml =================================================================== --- modules/wsrp/trunk/service/src/main/resources/META-INF/jboss-service.xml 2009-07-27 15:50:05 UTC (rev 13605) +++ modules/wsrp/trunk/service/src/main/resources/META-INF/jboss-service.xml 2009-07-28 11:43:32 UTC (rev 13606) @@ -32,13 +32,6 @@ <!-- **** Portlet application registry beans --> - <!-- Default servlet container (should ideally be obtained from a ServletContainerFactory but directly instantiated here) --> - <mbean code="org.jboss.portal.web.impl.DefaultServletContainer" - name="portletcontainer:service=ServletContainer" xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - </mbean> - <mbean code="org.jboss.portal.web.impl.DefaultServletContainerFactory" name="portletcontainer:service=ServletContainerFactory" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> @@ -50,8 +43,8 @@ name="portletcontainer:service=PortletApplicationRegistry" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="ServletContainer" proxy-type="attribute"> - portletcontainer:service=ServletContainer + <depends optional-attribute-name="ServletContainerFactory" proxy-type="attribute"> + portletcontainer:service=ServletContainerFactory </depends> <depends optional-attribute-name="ContainerPortletInvoker" proxy-type="attribute"> portletcontainer:service=PortletInvoker,type=Container @@ -67,8 +60,8 @@ <xmbean/> <!--<depends optional-attribute-name="PortletApplicationRegistry" proxy-type="attribute"> portletcontainer:service=PortletApplicationRegistry - </depends> - <depends optional-attribute-name="Next" proxy-type="attribute"> + </depends>--> + <!--<depends optional-attribute-name="Next" proxy-type="attribute"> portletcontainer:service=Interceptor,type=Producer,name=SecureTransport </depends>--> </mbean> @@ -84,10 +77,10 @@ name="portletcontainer:service=Interceptor,type=Producer,name=ContextDispatcher" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <!--<depends optional-attribute-name="ServletContainerFactory" proxy-type="attribute"> + <depends optional-attribute-name="ServletContainerFactory" proxy-type="attribute"> portletcontainer:service=ServletContainerFactory </depends> - <depends optional-attribute-name="Next" proxy-type="attribute"> + <!--<depends optional-attribute-name="Next" proxy-type="attribute"> portletcontainer:service=Interceptor,type=Producer,name=ProducerCache </depends>--> </mbean>