gatein SVN: r218 - components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-09-30 15:51:35 -0400 (Wed, 30 Sep 2009)
New Revision: 218
Modified:
components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/web.xml
Log:
- Re-activated ServletAccessFilter that is needed for Markup operations.
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/web.xml 2009-09-30 17:05:16 UTC (rev 217)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/web.xml 2009-09-30 19:51:35 UTC (rev 218)
@@ -28,14 +28,14 @@
version="2.4">
<!-- Filter to put request and response in ServletAccess -->
- <!-- <filter>
+ <filter>
<filter-name>ServletAccessFilter</filter-name>
- <filter-class>org.jboss.portal.wsrp.servlet.ServletAccessFilter</filter-class>
+ <filter-class>org.gatein.wsrp.servlet.ServletAccessFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ServletAccessFilter</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>-->
+ </filter-mapping>
<!-- Wraps WSRP requests in transactions -->
<!--<filter>
@@ -53,14 +53,6 @@
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>-->
- <!--<listener>
- <listener-class>org.jboss.portal.wsrp.exo.KernelListener</listener-class>
- </listener>
- <servlet>
- <servlet-name>WSRPExoInt</servlet-name>
- <servlet-class>org.jboss.portal.wsrp.exo.ExoKernelIntegration</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>-->
<!-- WSRP Endpoints -->
14 years, 7 months
gatein SVN: r217 - components/wsrp/trunk/common/src/main/java/org/gatein/wsrp.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-09-30 13:05:16 -0400 (Wed, 30 Sep 2009)
New Revision: 217
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
Log:
- More NPE prevention.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2009-09-30 16:50:22 UTC (rev 216)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2009-09-30 17:05:16 UTC (rev 217)
@@ -80,6 +80,7 @@
import org.oasis.wsrp.v1.UserContext;
import javax.xml.namespace.QName;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -365,8 +366,14 @@
markupParams.setSecureClientCommunication(secureClientCommunication);
markupParams.setMode(mode);
markupParams.setWindowState(windowState);
- markupParams.getLocales().addAll(locales);
- markupParams.getMimeTypes().addAll(mimeTypes);
+ if (existsAndIsNotEmpty(locales))
+ {
+ markupParams.getLocales().addAll(locales);
+ }
+ if (existsAndIsNotEmpty(mimeTypes))
+ {
+ markupParams.getMimeTypes().addAll(mimeTypes);
+ }
return markupParams;
}
@@ -773,7 +780,10 @@
public static ModelDescription createModelDescription(List<PropertyDescription> propertyDescriptions)
{
ModelDescription description = new ModelDescription();
- description.getPropertyDescriptions().addAll(propertyDescriptions);
+ if (existsAndIsNotEmpty(propertyDescriptions))
+ {
+ description.getPropertyDescriptions().addAll(propertyDescriptions);
+ }
return description;
}
@@ -868,7 +878,10 @@
description.setRegistrationContext(registrationContext);
description.setPortletContext(portletContext);
description.setUserContext(userContext);
- description.getDesiredLocales().addAll(desiredLocales);
+ if (existsAndIsNotEmpty(desiredLocales))
+ {
+ description.getDesiredLocales().addAll(desiredLocales);
+ }
return description;
}
@@ -914,7 +927,10 @@
public static DestroyPortletsResponse createDestroyPortletsResponse(List<DestroyFailed> destroyFailed)
{
DestroyPortletsResponse destroyPortletsResponse = new DestroyPortletsResponse();
- destroyPortletsResponse.getDestroyFailed().addAll(destroyFailed);
+ if (existsAndIsNotEmpty(destroyFailed))
+ {
+ destroyPortletsResponse.getDestroyFailed().addAll(destroyFailed);
+ }
return destroyPortletsResponse;
}
@@ -986,7 +1002,10 @@
DestroyPortlets destroyPortlets = new DestroyPortlets();
destroyPortlets.setRegistrationContext(registrationContext);
- destroyPortlets.getPortletHandles().addAll(portletHandles);
+ if (existsAndIsNotEmpty(portletHandles))
+ {
+ destroyPortlets.getPortletHandles().addAll(portletHandles);
+ }
return destroyPortlets;
}
@@ -1033,7 +1052,10 @@
ReleaseSessions sessions = new ReleaseSessions();
sessions.setRegistrationContext(registrationContext);
- sessions.getSessionIDs().addAll(sessionIDs);
+ if (existsAndIsNotEmpty(sessionIDs))
+ {
+ sessions.getSessionIDs().addAll(sessionIDs);
+ }
return sessions;
}
@@ -1080,18 +1102,24 @@
{
MarkupType markupType = new MarkupType();
markupType.setMimeType(mimeType);
- if (modeNames != null)
+
+ if (existsAndIsNotEmpty(modeNames))
{
markupType.getModes().addAll(modeNames);
}
- if (windowStateNames != null)
+ if (existsAndIsNotEmpty(windowStateNames))
{
markupType.getWindowStates().addAll(windowStateNames);
}
- if (localeNames != null)
+ if (existsAndIsNotEmpty(localeNames))
{
markupType.getLocales().addAll(localeNames);
}
return markupType;
}
+
+ private static boolean existsAndIsNotEmpty(Collection collection)
+ {
+ return collection != null && !collection.isEmpty();
+ }
}
14 years, 7 months
gatein SVN: r216 - components/wsrp/trunk/common/src/main/java/org/gatein/wsrp.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-09-30 12:50:22 -0400 (Wed, 30 Sep 2009)
New Revision: 216
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
Log:
- Avoid potential NPE.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2009-09-30 13:49:17 UTC (rev 215)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2009-09-30 16:50:22 UTC (rev 216)
@@ -23,11 +23,10 @@
package org.gatein.wsrp;
-import org.gatein.pc.api.Mode;
-import org.gatein.pc.api.WindowState;
import org.gatein.common.util.ParameterValidation;
import org.gatein.common.util.Tools;
import org.gatein.pc.api.ActionURL;
+import org.gatein.pc.api.Mode;
import org.gatein.pc.api.OpaqueStateString;
import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.PortletURL;
@@ -35,6 +34,7 @@
import org.gatein.pc.api.StateString;
import org.gatein.pc.api.StatefulPortletContext;
import org.gatein.pc.api.URLFormat;
+import org.gatein.pc.api.WindowState;
import org.gatein.pc.api.spi.PortletInvocationContext;
import org.oasis.wsrp.v1.BlockingInteractionResponse;
import org.oasis.wsrp.v1.CacheControl;
@@ -1080,9 +1080,18 @@
{
MarkupType markupType = new MarkupType();
markupType.setMimeType(mimeType);
- markupType.getModes().addAll(modeNames);
- markupType.getWindowStates().addAll(windowStateNames);
- markupType.getLocales().addAll(localeNames);
+ if (modeNames != null)
+ {
+ markupType.getModes().addAll(modeNames);
+ }
+ if (windowStateNames != null)
+ {
+ markupType.getWindowStates().addAll(windowStateNames);
+ }
+ if (localeNames != null)
+ {
+ markupType.getLocales().addAll(localeNames);
+ }
return markupType;
}
}
14 years, 7 months
gatein SVN: r215 - in components/wsrp/trunk: producer/src/main/java/org/gatein/wsrp/producer and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-09-30 09:49:17 -0400 (Wed, 30 Sep 2009)
New Revision: 215
Added:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ProducerHolder.java
Removed:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/endpoints/
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java
components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/WSRPBaseEndpoint.java
Log:
- Changed mechanism to inject WSRPProducer into endpoints. Producer is now a singleton. Might need to revisit this solution in the future, notably when clustering is required.
- Move ProducerHolder to producer package.
Copied: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ProducerHolder.java (from rev 212, components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/endpoints/ProducerHolder.java)
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ProducerHolder.java (rev 0)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ProducerHolder.java 2009-09-30 13:49:17 UTC (rev 215)
@@ -0,0 +1,54 @@
+/*
+ * 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.producer;
+
+/**
+ * Holds the current WSRPProducer as configured for a particular portlet container.
+ *
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class ProducerHolder
+{
+ private ProducerHolder()
+ {
+ }
+
+ public static WSRPProducer getProducer()
+ {
+ return getProducer(false);
+ }
+
+ public static WSRPProducer getProducer(boolean allowUnstartedProducer)
+ {
+ if (allowUnstartedProducer || WSRPProducerImpl.isProducerStarted())
+ {
+ return WSRPProducerImpl.getInstance();
+ }
+ else
+ {
+ throw new IllegalStateException("Attempting to access a non-started producer!");
+ }
+ }
+}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java 2009-09-29 22:55:57 UTC (rev 214)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/ServiceDescriptionHandler.java 2009-09-30 13:49:17 UTC (rev 215)
@@ -66,7 +66,8 @@
* @version $Revision: 12017 $
* @since 2.4
*/
-class ServiceDescriptionHandler extends ServiceHandler implements ServiceDescriptionInterface
+class
+ ServiceDescriptionHandler extends ServiceHandler implements ServiceDescriptionInterface
{
// JBPORTAL-1220: force call to initCookie... Required so that BEA version < 9.2 will behave properly as a Consumer
private final CookieProtocol BEA_8_CONSUMER_FIX = CookieProtocol.PER_USER;
@@ -97,7 +98,10 @@
// get the portlet descriptions based on registration information
List<PortletDescription> offeredPortlets = getPortletDescriptions(gs.getDesiredLocales(), registration);
- serviceDescription.getOfferedPortlets().addAll(offeredPortlets);
+ if (offeredPortlets != null)
+ {
+ serviceDescription.getOfferedPortlets().addAll(offeredPortlets);
+ }
// if we don't have registration information but a registration is required, send registration props information
if (registration == null && requirements.isRegistrationRequired())
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java 2009-09-29 22:55:57 UTC (rev 214)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducerImpl.java 2009-09-30 13:49:17 UTC (rev 215)
@@ -100,28 +100,43 @@
private PortletInvoker invoker;
/** Handles Markup interface calls. */
- private MarkupHandler markupHandler;
+ private final MarkupHandler markupHandler;
/** Handles ServiceDescription interface calls. */
- private ServiceDescriptionHandler serviceDescriptionHandler;
+ private final ServiceDescriptionHandler serviceDescriptionHandler;
/** Handles Registration interface calls. */
- private RegistrationHandler registrationHandler;
+ private final RegistrationHandler registrationHandler;
/** Handles Portlet Management interface calls. */
- private PortletManagementHandler portletManagementHandler;
+ private final PortletManagementHandler portletManagementHandler;
/** Registration Manager */
- private RegistrationManager registrationManager;
+ private RegistrationManager registrationManager; //todo: make sure it's multi-thread safe
- /** Supported locales. */
- private List<String> supportedLocales = WSRPConstants.getDefaultLocales();
-
/** configuration service */
- private ProducerConfigurationService configurationService;
+ private ProducerConfigurationService configurationService; //todo: make sure it's multi-thread safe
- public WSRPProducerImpl()
+ private boolean started = false;
+
+ // On-demand class holder Singleton pattern (multi-thread safe)
+ private static final class InstanceHolder
{
+ public static final WSRPProducerImpl producer = new WSRPProducerImpl();
+ }
+
+ static WSRPProducer getInstance()
+ {
+ return InstanceHolder.producer;
+ }
+
+ static boolean isProducerStarted()
+ {
+ return InstanceHolder.producer.started;
+ }
+
+ private WSRPProducerImpl()
+ {
markupHandler = new MarkupHandler(this);
serviceDescriptionHandler = new ServiceDescriptionHandler(this);
registrationHandler = new RegistrationHandler(this);
@@ -289,31 +304,41 @@
return configurationService;
}
- public void start()
+ public synchronized void start()
{
- ProducerConfiguration configuration = configurationService.getConfiguration();
+ if (!started)
+ {
+ ProducerConfiguration configuration = configurationService.getConfiguration();
- // register to listen to changes in configuration and get initial state
- configuration.addChangeListener(this);
- usingStrictModeChangedTo(configuration.isUsingStrictMode());
+ // register to listen to changes in configuration and get initial state
+ configuration.addChangeListener(this);
+ usingStrictModeChangedTo(configuration.isUsingStrictMode());
- ProducerRegistrationRequirements registrationRequirements = getProducerRegistrationRequirements();
- registrationRequirements.addRegistrationPolicyChangeListener(registrationManager);
- registrationRequirements.addRegistrationPropertyChangeListener(registrationManager);
+ ProducerRegistrationRequirements registrationRequirements = getProducerRegistrationRequirements();
+ registrationRequirements.addRegistrationPolicyChangeListener(registrationManager);
+ registrationRequirements.addRegistrationPropertyChangeListener(registrationManager);
- if (registrationRequirements.isRegistrationRequired())
- {
- registrationManager.setPolicy(registrationRequirements.getPolicy());
+ if (registrationRequirements.isRegistrationRequired())
+ {
+ registrationManager.setPolicy(registrationRequirements.getPolicy());
+ }
+
+ started = true;
}
}
- public void stop()
+ public synchronized void stop()
{
- ProducerRegistrationRequirements registrationRequirements = getProducerRegistrationRequirements();
- registrationRequirements.removeRegistrationPropertyChangeListener(registrationManager);
- registrationRequirements.removeRegistrationPolicyChangeListener(registrationManager);
+ if (started)
+ {
+ ProducerRegistrationRequirements registrationRequirements = getProducerRegistrationRequirements();
+ registrationRequirements.removeRegistrationPropertyChangeListener(registrationManager);
+ registrationRequirements.removeRegistrationPolicyChangeListener(registrationManager);
- getProducerConfiguration().removeChangeListener(this);
+ getProducerConfiguration().removeChangeListener(this);
+
+ started = false;
+ }
}
int getExpirationTime()
@@ -441,7 +466,7 @@
public List<String> getSupportedLocales()
{
- return supportedLocales; // todo: avoid hardcoding this at some point...
+ return WSRPConstants.getDefaultLocales(); // todo: avoid hardcoding this at some point...
}
public void usingStrictModeChangedTo(boolean strictMode)
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/WSRPBaseEndpoint.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/WSRPBaseEndpoint.java 2009-09-29 22:55:57 UTC (rev 214)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/WSRPBaseEndpoint.java 2009-09-30 13:49:17 UTC (rev 215)
@@ -23,6 +23,7 @@
package org.gatein.wsrp.endpoints;
+import org.gatein.wsrp.producer.ProducerHolder;
import org.gatein.wsrp.producer.WSRPProducer;
import org.gatein.wsrp.servlet.ServletAccess;
14 years, 7 months
gatein SVN: r214 - components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-09-29 18:55:57 -0400 (Tue, 29 Sep 2009)
New Revision: 214
Modified:
components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/MarkupEndpoint.java
components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/PortletManagementEndpoint.java
components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/RegistrationEndpoint.java
components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/ServiceDescriptionEndpoint.java
Log:
- Forgot to adjust the service name in the JAX-WS annotations... :/
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/MarkupEndpoint.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/MarkupEndpoint.java 2009-09-29 17:47:16 UTC (rev 213)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/MarkupEndpoint.java 2009-09-29 22:55:57 UTC (rev 214)
@@ -69,7 +69,7 @@
*/
@javax.jws.WebService(
name = "WSRPV1MarkupPortType",
- serviceName = "WSRPV1Service",
+ serviceName = "WSRPService",
portName = "WSRPMarkupService",
targetNamespace = "urn:oasis:names:tc:wsrp:v1:wsdl",
wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl",
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/PortletManagementEndpoint.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/PortletManagementEndpoint.java 2009-09-29 17:47:16 UTC (rev 213)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/PortletManagementEndpoint.java 2009-09-29 22:55:57 UTC (rev 214)
@@ -64,7 +64,7 @@
*/
@javax.jws.WebService(
name = "WSRPV1PortletManagementPortType",
- serviceName = "WSRPV1Service",
+ serviceName = "WSRPService",
portName = "WSRPPortletManagementService",
targetNamespace = "urn:oasis:names:tc:wsrp:v1:wsdl",
wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl",
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/RegistrationEndpoint.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/RegistrationEndpoint.java 2009-09-29 17:47:16 UTC (rev 213)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/RegistrationEndpoint.java 2009-09-29 22:55:57 UTC (rev 214)
@@ -46,7 +46,7 @@
*/
@javax.jws.WebService(
name = "WSRPV1RegistrationPortType",
- serviceName = "WSRPV1Service",
+ serviceName = "WSRPService",
portName = "WSRPRegistrationService",
targetNamespace = "urn:oasis:names:tc:wsrp:v1:wsdl",
wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl",
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/ServiceDescriptionEndpoint.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/ServiceDescriptionEndpoint.java 2009-09-29 17:47:16 UTC (rev 213)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/ServiceDescriptionEndpoint.java 2009-09-29 22:55:57 UTC (rev 214)
@@ -48,7 +48,7 @@
*/
@javax.jws.WebService(
name = "WSRPV1ServiceDescriptionPortType",
- serviceName = "WSRPV1Service",
+ serviceName = "WSRPService",
portName = "WSRPServiceDescriptionService",
targetNamespace = "urn:oasis:names:tc:wsrp:v1:wsdl",
wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl",
14 years, 7 months
gatein SVN: r213 - components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-09-29 13:47:16 -0400 (Tue, 29 Sep 2009)
New Revision: 213
Modified:
components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp_services.wsdl
Log:
- Service name needs to be standard as some implementations rely on it (in particular, JBoss Portal).
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp_services.wsdl
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp_services.wsdl 2009-09-29 13:49:42 UTC (rev 212)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp_services.wsdl 2009-09-29 17:47:16 UTC (rev 213)
@@ -33,7 +33,7 @@
<import namespace="urn:oasis:names:tc:wsrp:v1:bind" location="wsrp_v1_bindings.wsdl"/>
- <wsdl:service name="WSRPV1Service">
+ <wsdl:service name="WSRPService">
<wsdl:port binding="bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPMarkupService">
<soap:address location="REPLACE_WITH_ACTUAL_URL"/>
</wsdl:port>
14 years, 7 months
gatein SVN: r212 - in components/pc/trunk: api and 11 other directories.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2009-09-29 09:49:42 -0400 (Tue, 29 Sep 2009)
New Revision: 212
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
Maven configurating refactored.
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/api/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
@@ -21,6 +20,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
</dependency>
+
<dependency>
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
@@ -28,7 +28,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/bridge/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
@@ -15,7 +14,6 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
@@ -23,5 +21,4 @@
</dependency>
</dependencies>
-
</project>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/controller/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
@@ -12,11 +11,10 @@
<name>GateIn - Portlet Container (controller)</name>
<dependencies>
-
+ <!-- Internal dependencies -->
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
<type>jar</type>
</dependency>
@@ -31,7 +29,6 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/docs/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -3,9 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/federation/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
@@ -15,7 +14,6 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
</dependency>
@@ -28,7 +26,6 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/jsr168api/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/management/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
@@ -15,7 +14,6 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/mc/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
@@ -15,8 +14,8 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -1,107 +1,204 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.gatein.pc</groupId>
- <artifactId>module-aggregator</artifactId>
- <packaging>pom</packaging>
- <name>GateIn - Portlet Container (aggregator)</name>
- <version>2.1.0-SNAPSHOT</version>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>GateIn - Portlet Container</name>
+
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</url>
+ </scm>
+
+ <properties>
+ <version.gatein.common>2.0.0-Beta02</version.gatein.common>
+ <version.gatein.wci>2.0.0-SNAPSHOT</version.gatein.wci>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Import dependency management configuration -->
+ <dependency>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-dep</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Internal dependencies -->
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-common</artifactId>
+ <version>${version.gatein.common}</version>
+ </dependency>
- <distributionManagement>
- <repository>
- <!-- Copy the distribution jar file to a local checkout of the maven repository -->
- <!-- This variable can be set in $MAVEN_HOME/conf/settings.xml -->
- <id>repository.jboss.org</id>
- <url>file://${jboss.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>default</id>
- <modules>
- <module>build</module>
- <module>api</module>
- <module>jsr168api</module>
- <module>portlet</module>
- <module>controller</module>
- <module>bridge</module>
- <module>federation</module>
- <module>management</module>
- <module>mc</module>
- <module>test</module>
- <module>portal</module>
- <module>samples</module>
- <module>docs</module>
- </modules>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>docs</id>
- <modules>
- <module>docs</module>
- </modules>
- </profile>
- <profile>
- <id>test</id>
- <modules>
- <module>build</module>
- <module>api</module>
- <module>portlet</module>
- <module>controller</module>
- <module>mc</module>
- <module>test</module>
- </modules>
- </profile>
- <profile>
- <id>portal</id>
- <modules>
- <module>build</module>
- <module>api</module>
- <module>portlet</module>
- <module>controller</module>
- <module>mc</module>
- <module>portal</module>
- <module>samples</module>
- </modules>
- </profile>
- <profile>
- <id>release</id>
- <modules>
- <module>build</module>
- <module>api</module>
- <module>portlet</module>
- <module>controller</module>
- <module>mc</module>
- <module>portal</module>
- <module>samples</module>
- <module>docs</module>
- </modules>
- </profile>
- </profiles>
-
- <modules>
- </modules>
-
- <reporting>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-mc</artifactId>
+ <version>${version.gatein.common}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-portlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-controller</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-mc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ <version>${version.gatein.wci}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-maven2</artifactId>
+ <version>1.2.1</version>
+ </plugin>
</plugins>
- </reporting>
-
-
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <modules>
+ <module>api</module>
+ <module>jsr168api</module>
+ <module>portlet</module>
+ <module>controller</module>
+ <module>bridge</module>
+ <module>federation</module>
+ <module>management</module>
+ <module>mc</module>
+ <module>test</module>
+ <module>portal</module>
+ <module>samples</module>
+ <module>docs</module>
+ </modules>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>docs</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>test</id>
+ <modules>
+ <module>api</module>
+ <module>portlet</module>
+ <module>controller</module>
+ <module>mc</module>
+ <module>test</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>portal</id>
+ <modules>
+ <module>api</module>
+ <module>portlet</module>
+ <module>controller</module>
+ <module>mc</module>
+ <module>portal</module>
+ <module>samples</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>api</module>
+ <module>portlet</module>
+ <module>controller</module>
+ <module>mc</module>
+ <module>portal</module>
+ <module>samples</module>
+ <module>docs</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
</project>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/portal/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
@@ -26,28 +25,23 @@
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-controller</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-mc</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/portlet/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
@@ -12,17 +11,9 @@
<name>GateIn - Portlet Container (pc)</name>
<dependencies>
- <!--
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-jsr168api</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/samples/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
+++ components/pc/trunk/test/pom.xml 2009-09-29 13:49:42 UTC (rev 212)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>pc-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
@@ -26,29 +25,24 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-controller</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-mc</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -151,7 +145,6 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
- <version>${version.cargo}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -160,12 +153,8 @@
<type>war</type>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-wci</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>javax.ccpp</groupId>
<artifactId>ccpp</artifactId>
</dependency>
14 years, 7 months
gatein SVN: r211 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2009-09-29 09:23:55 -0400 (Tue, 29 Sep 2009)
New Revision: 211
Modified:
components/mop/trunk/pom.xml
Log:
Maven configurating refactored.
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-09-29 12:07:38 UTC (rev 210)
+++ components/mop/trunk/pom.xml 2009-09-29 13:23:55 UTC (rev 211)
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>5-beta-1</version>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
@@ -58,96 +58,39 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
<url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
+
- <!-- Required to download Parent -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
-
- <properties>
- <!-- Dependencies versions -->
- <chromattic.version>1.0.0-beta3</chromattic.version>
-
- <!-- Plugins settings -->
-
- <!-- Cross plugins settings -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <!-- maven-compiler-plugin -->
- <maven.compiler.target>1.5</maven.compiler.target>
- <maven.compiler.source>1.5</maven.compiler.source>
-
- <!-- maven-release-plugin -->
- <useReleaseProfile>false</useReleaseProfile>
- <arguments>-Prelease</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </properties>
-
<dependencyManagement>
<dependencies>
- <!-- Internal dependencies -->
+ <!-- Import dependency management configuration -->
<dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-dep</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
+
+ <!-- Internal dependencies -->
<dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-api</artifactId>
+ <version>${project.version}</version>
</dependency>
- <!-- External dependencies -->
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>1.0</version>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-spi</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8</version>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.api</artifactId>
- <version>${chromattic.version}</version>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.core</artifactId>
- <version>${chromattic.version}</version>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.apt</artifactId>
- <version>${chromattic.version}</version>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.exo</artifactId>
- <version>${chromattic.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
</dependencies>
-
</dependencyManagement>
-
+
<dependencies>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<!-- **************** -->
@@ -155,105 +98,6 @@
<!-- **************** -->
<build>
- <pluginManagement>
- <!-- All plugins versions have to be set -->
- <!-- Plugins are sorted by shortname : clean, deploy, ... -->
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
-
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -291,6 +135,30 @@
</plugin>
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
<profiles>
<profile>
14 years, 7 months
gatein SVN: r210 - in components/common/trunk: common and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-29 08:07:38 -0400 (Tue, 29 Sep 2009)
New Revision: 210
Removed:
components/common/trunk/build/
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
Remove build directory and use 2.0.0-Beta03-SNAPSHOT as version (instead of trunk-SNAPSHOT)
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2009-09-29 08:58:39 UTC (rev 209)
+++ components/common/trunk/common/pom.xml 2009-09-29 12:07:38 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2009-09-29 08:58:39 UTC (rev 209)
+++ components/common/trunk/mc/pom.xml 2009-09-29 12:07:38 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2009-09-29 08:58:39 UTC (rev 209)
+++ components/common/trunk/pom.xml 2009-09-29 12:07:38 UTC (rev 210)
@@ -8,7 +8,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
14 years, 7 months
gatein SVN: r209 - in components/common/trunk: common and 1 other directories.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2009-09-29 04:58:39 -0400 (Tue, 29 Sep 2009)
New Revision: 209
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
Maven configurating refactored.
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2009-09-29 08:43:31 UTC (rev 208)
+++ components/common/trunk/common/pom.xml 2009-09-29 08:58:39 UTC (rev 209)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.common</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>common-parent</artifactId>
<version>trunk-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2009-09-29 08:43:31 UTC (rev 208)
+++ components/common/trunk/mc/pom.xml 2009-09-29 08:58:39 UTC (rev 209)
@@ -2,9 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.common</groupId>
- <artifactId>module-parent</artifactId>
+ <artifactId>common-parent</artifactId>
<version>trunk-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2009-09-29 08:43:31 UTC (rev 208)
+++ components/common/trunk/pom.xml 2009-09-29 08:58:39 UTC (rev 209)
@@ -1,45 +1,76 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.gatein.common</groupId>
- <artifactId>module-aggregator</artifactId>
- <packaging>pom</packaging>
- <name>GateIn - Common component (aggregator)</name>
- <version>trunk-SNAPSHOT</version>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>GateIn - Common component</name>
+
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-parent</artifactId>
+ <version>trunk-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk/</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
- <distributionManagement>
- <repository>
- <!--Copy the distribution jar file to a local checkout of the maven repository
- - This variable can be set in $MAVEN_HOME/conf/settings.xml-->
- <id>repository.jboss.org</id>
- <url>file://${jboss.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
+ <!-- Import dependency management configuration -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-dep</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <modules>
+ <module>common</module>
+ <module>mc</module>
+ </modules>
- <modules>
- <module>build</module>
- <module>common</module>
- <module>mc</module>
- </modules>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-
-
</project>
14 years, 7 months