Author: chris.laprun(a)jboss.com Date: 2009-07-02 07:28:54 -0400 (Thu, 02 Jul 2009) New Revision: 13513 Removed: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJBossService.java modules/wsrp/trunk/core/src/main/resources/portal-wsrp-sar/ Modified: modules/wsrp/trunk/core/pom.xml modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/CachingServiceFactory.java modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/servlet/ServletAccessService.java modules/wsrp/trunk/service/pom.xml modules/wsrp/trunk/test-support/src/main/java/org/jboss/portal/wsrp/framework/TestWSRPProducerImpl.java modules/wsrp/trunk/wsrp1-rpc/pom.xml Log: - JBPORTAL-2186: More WSRP extraction + Added dependency on newly created jems module for now as too many functionality had to be imported otherwise. + Added AOPC plugin for ConsumerRegistryService. + Renamed service artifacts and use proper dependent artifacts. + Added dependencies in lib directory. + Cleaned up. Modified: modules/wsrp/trunk/core/pom.xml =================================================================== --- modules/wsrp/trunk/core/pom.xml 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/pom.xml 2009-07-02 11:28:54 UTC (rev 13513) @@ -70,6 +70,11 @@ <artifactId>portlet-federation</artifactId> <version>${version.portlet}</version> </dependency> + <dependency> + <groupId>org.jboss.portal.jems</groupId> + <artifactId>jems</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> <!-- JBoss dependencies --> <dependency> @@ -87,6 +92,18 @@ <artifactId>jboss-system</artifactId> <version>${version.jbossas}</version> </dependency> + <!-- For JBoss AOP --> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + <version>${version.jbossas}</version> + </dependency> + <!-- Services & Hibernate dependencies --> + <dependency> + <groupId>org.jboss.portal.jems</groupId> + <artifactId>jems</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> <!-- other dependencies --> @@ -101,11 +118,6 @@ <version>${version.slf4j}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${version.slf4j}</version> - </dependency> - <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> <version>1.2.1</version> @@ -130,6 +142,16 @@ <build> <finalName>portal-wsrp</finalName> <sourceDirectory>src/main</sourceDirectory> + + <resources> + <resource> + <directory>src/resources</directory> + <excludes> + <exclude>src/resources/**</exclude> + </excludes> + </resource> + </resources> + <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -152,13 +174,41 @@ <descriptors> <descriptor>src/assemble/portal-wsrp-client-jar.xml</descriptor> <descriptor>src/assemble/portal-wsrp-war.xml</descriptor> - <descriptor>src/assemble/portal-wsrp-sar.xml</descriptor> <!--<descriptor>src/assemble/portal-wsrp-tests-jar.xml</descriptor>--> </descriptors> </configuration> </execution> </executions> </plugin> + + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jbossaop-plugin</artifactId> + <version>1.0.0.GA</version> + <executions> + <execution> + <id>compile</id> + <configuration> + <!-- if you want to include dependencies from the current module + (only needed if a class inherits a class thats not defined in this module + --> + <includeProjectDependency>true</includeProjectDependency> + <aoppaths> + <aoppath>src/main/resources/portal-wsrp-sar/wsrp-aop.xml</aoppath> + <!-- for a second jboss-aop.xml file + <aoppath>src/main/resources/jboss-aop.xml</aoppath> + --> + </aoppaths> + <includes> + <include>org/jboss/portal/wsrp/consumer/ConsumerRegistryService.class</include> + </includes> + </configuration> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Modified: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -27,13 +27,13 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.federation.FederatedPortletInvoker; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.wsrp.WSRPConsumer; import org.jboss.portal.wsrp.api.SessionEventBroadcaster; -import org.jboss.portal.wsrp.services.AbstractJBossService; import javax.naming.InitialContext; import java.util.ArrayList; Modified: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -25,6 +25,7 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.InvokerUnavailableException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -64,7 +65,6 @@ import org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType; import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType; import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType; -import org.jboss.portal.wsrp.services.AbstractJBossService; import org.jboss.portal.wsrp.services.ServiceFactory; import org.jboss.portal.wsrp.servlet.UserAccess; Modified: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -23,6 +23,7 @@ package org.jboss.portal.wsrp.producer; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvoker; @@ -78,7 +79,6 @@ import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService; import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; -import org.jboss.portal.wsrp.services.AbstractJBossService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -26,6 +26,7 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.mx.util.ObjectNameFactory; import org.jboss.portal.common.net.URLTools; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.registration.RegistrationPolicyChangeListener; import org.jboss.portal.registration.RegistrationPropertyChangeListener; import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; @@ -34,7 +35,6 @@ import org.jboss.portal.wsrp.producer.config.ProducerConfigurationProvider; import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService; import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; -import org.jboss.portal.wsrp.services.AbstractJBossService; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.ObjectModelProvider; Deleted: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJBossService.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJBossService.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJBossService.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -1,87 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2009, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ - -package org.jboss.portal.wsrp.services; - -import org.jboss.logging.Logger; -import org.jboss.system.ServiceMBeanSupport; - -/** - * TODO: REMOVE Legacy JBoss service integration helper. Will need to be removed once first extraction stage is - * complete. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 8784 $ - */ -public class AbstractJBossService extends ServiceMBeanSupport -{ - - public AbstractJBossService() - { - } - - public AbstractJBossService(final Class type) - { - super(type); - } - - public AbstractJBossService(final String category) - { - super(category); - } - - public AbstractJBossService(final Logger log) - { - super(log); - } - - public final int getState() - { - return super.getState(); - } - - public final String getStateString() - { - return super.getStateString(); - } - - public final void create() throws Exception - { - super.create(); - } - - public final void start() throws Exception - { - super.start(); - } - - public final void stop() - { - super.stop(); - } - - public final void destroy() - { - super.destroy(); - } -} \ No newline at end of file Modified: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -20,9 +20,11 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ + package org.jboss.portal.wsrp.services; import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/CachingServiceFactory.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/CachingServiceFactory.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/services/CachingServiceFactory.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -23,6 +23,8 @@ package org.jboss.portal.wsrp.services; +import org.jboss.portal.jems.as.system.AbstractJBossService; + import java.rmi.Remote; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; Modified: modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/servlet/ServletAccessService.java =================================================================== --- modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/servlet/ServletAccessService.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/core/src/main/java/org/jboss/portal/wsrp/servlet/ServletAccessService.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -20,9 +20,10 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ + package org.jboss.portal.wsrp.servlet; -import org.jboss.portal.wsrp.services.AbstractJBossService; +import org.jboss.portal.jems.as.system.AbstractJBossService; import javax.management.ObjectName; import java.lang.reflect.Proxy; Modified: modules/wsrp/trunk/service/pom.xml =================================================================== --- modules/wsrp/trunk/service/pom.xml 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/service/pom.xml 2009-07-02 11:28:54 UTC (rev 13513) @@ -34,16 +34,8 @@ <packaging>jboss-sar</packaging> <name>JBoss Portal WSRP Service</name> - <!--<dependencies> - <dependency> - <groupId>org.jboss.portal.jopr</groupId> - <artifactId>portal-management</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> ---> - <build> + <finalName>portal-wsrp</finalName> <plugins> <plugin> <artifactId>maven-dependency-plugin</artifactId> @@ -59,10 +51,65 @@ <artifactItems> <artifactItem> <groupId>org.jboss.portal.wsrp</groupId> + <artifactId>wsrp1-rpc</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.jboss.portal.wsrp</groupId> <artifactId>wsrp-core</artifactId> <version>${project.version}</version> </artifactItem> + <artifactItem> + <groupId>org.jboss.portal.wsrp</groupId> + <artifactId>wsrp-core</artifactId> + <classifier>client</classifier> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.jboss.portal.wsrp</groupId> + <artifactId>wsrp-core</artifactId> + <type>war</type> + <classifier>server</classifier> + <version>${project.version}</version> + </artifactItem> </artifactItems> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + </configuration> + </execution> + <execution> + <id>copy-portal-runtime-libs</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${version.slf4j}</version> + </artifactItem> + <artifactItem> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${version.slf4j}</version> + </artifactItem> + <artifactItem> + <groupId>org.jboss.portal.registration</groupId> + <artifactId>registration-api</artifactId> + <version>1.0.0-SNAPSHOT</version> + </artifactItem> + <artifactItem> + <groupId>org.jboss.portal.registration</groupId> + <artifactId>registration-impl</artifactId> + <version>1.0.0-SNAPSHOT</version> + </artifactItem> + <artifactItem> + <groupId>org.jboss.portal.jems</groupId> + <artifactId>jems</artifactId> + <version>1.0.0-SNAPSHOT</version> + </artifactItem> + </artifactItems> <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> </configuration> </execution> Modified: modules/wsrp/trunk/test-support/src/main/java/org/jboss/portal/wsrp/framework/TestWSRPProducerImpl.java =================================================================== --- modules/wsrp/trunk/test-support/src/main/java/org/jboss/portal/wsrp/framework/TestWSRPProducerImpl.java 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/test-support/src/main/java/org/jboss/portal/wsrp/framework/TestWSRPProducerImpl.java 2009-07-02 11:28:54 UTC (rev 13513) @@ -23,6 +23,7 @@ package org.jboss.portal.wsrp.framework; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.registration.RegistrationManager; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.core.AccessDeniedFault; @@ -67,7 +68,6 @@ import org.jboss.portal.wsrp.producer.WSRPValidator; import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; -import org.jboss.portal.wsrp.services.AbstractJBossService; import java.rmi.RemoteException; Modified: modules/wsrp/trunk/wsrp1-rpc/pom.xml =================================================================== --- modules/wsrp/trunk/wsrp1-rpc/pom.xml 2009-07-02 08:42:40 UTC (rev 13512) +++ modules/wsrp/trunk/wsrp1-rpc/pom.xml 2009-07-02 11:28:54 UTC (rev 13513) @@ -43,6 +43,7 @@ </dependencies> <build> + <finalName>wsrp1-rpc</finalName> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId>