Author: chris.laprun(a)jboss.com Date: 2009-09-22 07:55:26 -0400 (Tue, 22 Sep 2009) New Revision: 197 Removed: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/endpoints/JMX.java Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/jboss-portlet.xml components/wsrp/trunk/api/pom.xml components/wsrp/trunk/build/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/producer/src/main/webapp/WEB-INF/classes/wshandlers.xml components/wsrp/trunk/wsrp1-ws/pom.xml Log: - Forgot to change references to JBoss Portal in POM and faces-config.xml. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/admin-gui/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -24,7 +24,7 @@ <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> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> @@ -32,23 +32,23 @@ <modelVersion>4.0.0</modelVersion> <artifactId>admin-gui</artifactId> <packaging>war</packaging> - <name>JBoss Portal WSRP Admin GUI</name> + <name>GateIn WSRP Admin GUI</name> <dependencies> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>common</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>consumer</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>producer</artifactId> <version>${project.version}</version> <scope>provided</scope> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -33,7 +33,7 @@ <view-handler> org.jboss.portletbridge.application.PortletViewHandler </view-handler> - <navigation-handler>org.jboss.portal.wsrp.admin.ui.RedirectOnNoConsumerNavigationHandler</navigation-handler> + <navigation-handler>org.gatein.wsrp.admin.ui.RedirectOnNoConsumerNavigationHandler</navigation-handler> <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> <locale-config> <default-locale>en</default-locale> @@ -43,47 +43,47 @@ </application> <converter> - <converter-for-class>org.jboss.portal.wsrp.registration.LocalizedString</converter-for-class> - <converter-class>org.jboss.portal.wsrp.admin.ui.LocalizedStringConverter</converter-class> + <converter-for-class>org.gatein.wsrp.registration.LocalizedString</converter-for-class> + <converter-class>org.gatein.wsrp.admin.ui.LocalizedStringConverter</converter-class> </converter> <converter> <converter-id>faces.convert.RegistrationProperty.Status</converter-id> - <converter-class>org.jboss.portal.wsrp.admin.ui.StatusConverter</converter-class> + <converter-class>org.gatein.wsrp.admin.ui.StatusConverter</converter-class> </converter> <managed-bean> <managed-bean-name>beanContext</managed-bean-name> - <managed-bean-class>org.jboss.portal.faces.gui.JSFBeanContext</managed-bean-class> + <managed-bean-class>org.gatein.wsrp.admin.ui.JSFBeanContext</managed-bean-class> <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>consumersMgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ConsumerManagerBean</managed-bean-class> + <managed-bean-class>org.gatein.wsrp.admin.ui.ConsumerManagerBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> <property-name>registry</property-name> - <property-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</property-class> + <property-class>org.gatein.wsrp.consumer.ConsumerRegistry</property-class> <value>#{applicationScope.ConsumerRegistry}</value> </managed-property> <managed-property> <property-name>beanContext</property-name> - <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <property-class>org.gatein.wsrp.admin.ui.BeanContext</property-class> <value>#{beanContext}</value> </managed-property> </managed-bean> <managed-bean> <managed-bean-name>consumer</managed-bean-name> - <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ConsumerBean</managed-bean-class> + <managed-bean-class>org.gatein.wsrp.admin.ui.ConsumerBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> <property-name>beanContext</property-name> - <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <property-class>org.gatein.wsrp.admin.ui.BeanContext</property-class> <value>#{beanContext}</value> </managed-property> <managed-property> <property-name>registry</property-name> - <property-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</property-class> + <property-class>org.gatein.wsrp.consumer.ConsumerRegistry</property-class> <value>#{applicationScope.ConsumerRegistry}</value> </managed-property> <managed-property> @@ -97,16 +97,16 @@ </managed-bean> <managed-bean> <managed-bean-name>producer</managed-bean-name> - <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ProducerBean</managed-bean-class> + <managed-bean-class>org.gatein.wsrp.admin.ui.ProducerBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> <property-name>configurationService</property-name> - <property-class>org.jboss.portal.wsrp.producer.config.ProducerConfigurationService</property-class> + <property-class>org.gatein.wsrp.producer.config.ProducerConfigurationService</property-class> <value>#{applicationScope.ProducerConfigurationService}</value> </managed-property> <managed-property> <property-name>beanContext</property-name> - <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <property-class>org.gatein.wsrp.admin.ui.BeanContext</property-class> <value>#{beanContext}</value> </managed-property> </managed-bean> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/jboss-portlet.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/jboss-portlet.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/jboss-portlet.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -34,12 +34,12 @@ </portlet> <service> <service-name>ConsumerRegistry</service-name> - <service-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</service-class> + <service-class>org.gatein.wsrp.consumer.ConsumerRegistry</service-class> <service-ref>portal.wsrp:service=ConsumerRegistry</service-ref> </service> <service> <service-name>ProducerConfigurationService</service-name> - <service-class>org.jboss.portal.wsrp.producer.config.ProducerConfigurationService</service-class> + <service-class>org.gatein.wsrp.producer.config.ProducerConfigurationService</service-class> <service-ref>portal.wsrp:service=ProducerConfiguration</service-ref> </service> </portlet-app> Modified: components/wsrp/trunk/api/pom.xml =================================================================== --- components/wsrp/trunk/api/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/api/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -1,5 +1,5 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ +<!-- + ~ 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 @@ -18,13 +18,13 @@ ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> <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> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> @@ -32,7 +32,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>api</artifactId> <packaging>jar</packaging> - <name>JBoss Portal WSRP Integration API</name> + <name>GateIn WSRP Integration API</name> <dependencies> <dependency> Modified: components/wsrp/trunk/build/pom.xml =================================================================== --- components/wsrp/trunk/build/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/build/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -39,12 +39,12 @@ <version>1.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>JBoss Portal WSRP Parent</name> - <description>JBoss Portal WSRP</description> + <name>GateIn WSRP Parent</name> + <description>GateIn WSRP</description> <!--All artifacts versions should be defined here--> <properties> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/common/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -24,7 +24,7 @@ <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> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> @@ -32,16 +32,16 @@ <modelVersion>4.0.0</modelVersion> <artifactId>common</artifactId> <packaging>jar</packaging> - <name>JBoss Portal WSRP Common Classes</name> + <name>GateIn WSRP Common Classes</name> <dependencies> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp1-ws</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> <version>${version.gatein.common}</version> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/consumer/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -24,7 +24,7 @@ <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> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> @@ -32,25 +32,25 @@ <modelVersion>4.0.0</modelVersion> <artifactId>consumer</artifactId> <packaging>jar</packaging> - <name>JBoss Portal WSRP Consumer</name> + <name>GateIn WSRP Consumer</name> <dependencies> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp1-ws</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> <version>${version.gatein.common}</version> @@ -74,7 +74,7 @@ <version>${version.gatein.pc}</version> <scope>provided</scope> </dependency> - + <!-- JBoss dependencies --> <dependency> <groupId>org.jboss</groupId> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -24,7 +24,7 @@ <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"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal WSRP</name> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/producer/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -24,7 +24,7 @@ <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> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> @@ -32,16 +32,16 @@ <modelVersion>4.0.0</modelVersion> <artifactId>producer</artifactId> <packaging>jar</packaging> - <name>JBoss Portal WSRP Producer</name> + <name>GateIn WSRP Producer</name> <dependencies> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp1-ws</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.jboss.portal.wsrp</groupId> + <groupId>org.gatein.wsrp</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Deleted: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/endpoints/JMX.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/endpoints/JMX.java 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/endpoints/JMX.java 2009-09-22 11:55:26 UTC (rev 197) @@ -1,98 +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.gatein.wsrp.endpoints; - -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanServerLocator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class JMX -{ - private static final Logger log = LoggerFactory.getLogger(JMX.class); - - /** - * Retrieves the MBeanProxy associated with the given class and name from the specified MBeanServer. - * - * @param expectedClass the expected class of the MBean's proxy - * @param name the MBean's ObjectName - * @param server the MBeanServer from which to retrieve the MBeanProxy - * @return a MBeanProxy for the specified MBean if it exists - * @throws RuntimeException if the MBean couldn't be retrieved - */ - public static <T> T getMBeanProxy(Class<T> expectedClass, ObjectName name, MBeanServer server) - { - try - { - return expectedClass.cast(MBeanProxy.get(expectedClass, name, server)); - } - catch (Exception e) - { - String message = "Couldn't retrieve '" + name.getCanonicalName() + "' MBean with class " + expectedClass.getName(); - log.error(message, e); - throw new RuntimeException(message, e); - } - } - - /** - * Retrieves the MBeanProxy associated with the given class and name from the JBoss microkernel as returned by - * <code>MBeanServerLocator.locateJBoss()</code>. - * - * @param expectedClass the expected class of the MBean's proxy - * @param name a String representation of the MBean's ObjectName - * @return a MBeanProxy for the specified MBean if it exists - * @throws IllegalArgumentException if the given name is not a valid ObjectName - * @throws RuntimeException if the MBean couldn't be retrieved - * @see #getMBeanProxy(Class, javax.management.ObjectName, javax.management.MBeanServer) - * @since 2.4 - */ - public static <T> T getMBeanProxy(Class<T> expectedClass, String name) - { - ObjectName objecName = createObjectName(name); - MBeanServer server = MBeanServerLocator.locateJBoss(); - return getMBeanProxy(expectedClass, objecName, server); - } - - private static ObjectName createObjectName(String name) - { - ObjectName objecName; - try - { - objecName = new ObjectName(name); - } - catch (MalformedObjectNameException e) - { - throw new IllegalArgumentException("'" + name + "' is not a valid ObjectName"); - } - return objecName; - } -} Modified: components/wsrp/trunk/producer/src/main/webapp/WEB-INF/classes/wshandlers.xml =================================================================== --- components/wsrp/trunk/producer/src/main/webapp/WEB-INF/classes/wshandlers.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/producer/src/main/webapp/WEB-INF/classes/wshandlers.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -27,7 +27,7 @@ <javaee:handler-chain> <javaee:handler> <javaee:handler-name>WSRP Extension Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.portal.wsrp.handler.WSRPExtensionHandler</javaee:handler-class> + <javaee:handler-class>org.gatein.wsrp.handler.WSRPExtensionHandler</javaee:handler-class> </javaee:handler> </javaee:handler-chain> </javaee:handler-chains> Modified: components/wsrp/trunk/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp1-ws/pom.xml 2009-09-22 07:34:13 UTC (rev 196) +++ components/wsrp/trunk/wsrp1-ws/pom.xml 2009-09-22 11:55:26 UTC (rev 197) @@ -24,7 +24,7 @@ <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> + <groupId>org.gatein.wsrp</groupId> <artifactId>module-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> @@ -32,7 +32,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>wsrp1-ws</artifactId> <packaging>jar</packaging> - <name>JBoss Portal WSRP Generated JAX-WS Classes</name> + <name>GateIn WSRP Generated JAX-WS Classes</name> <dependencies> <dependency>