Author: djencks
Date: Thu Dec 3 08:10:31 2009
New Revision: 886700
URL: http://svn.apache.org/viewvc?rev=886700&view=rev
Log:
PLUTO-585 use the felix maven plugin to build osgi bundles instead of plain jars. Make some
osgi package imports optional. Not yet completely running in an osgi environment but jars
at least load.
Modified:
portals/pluto/trunk/pluto-container-api/pom.xml
portals/pluto/trunk/pluto-container-driver-api/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pluto-container-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-api/pom.xml Thu Dec 3 08:10:31 2009
@@ -27,6 +27,7 @@
</parent>
<artifactId>pluto-container-api</artifactId>
+ <packaging>bundle</packaging>
<name>Apache Pluto Container API</name>
<dependencies>
@@ -51,6 +52,21 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>javax.ccpp;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
<!-- Don't create distribution artifacts -->
<profiles>
<profile>
Modified: portals/pluto/trunk/pluto-container-driver-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-driver-api/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-driver-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-driver-api/pom.xml Thu Dec 3 08:10:31 2009
@@ -27,7 +27,7 @@
</parent>
<artifactId>pluto-container-driver-api</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache Pluto Container Driver API</name>
<dependencies>
@@ -57,7 +57,21 @@
<scope>compile</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>javax.ccpp;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- Don't create distribution artifacts -->
<profiles>
<profile>
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Thu Dec 3 08:10:31 2009
@@ -27,6 +27,7 @@
</parent>
<artifactId>pluto-container</artifactId>
+ <packaging>bundle</packaging>
<name>Apache Pluto Portlet Container</name>
<description>The Apache Pluto portlet container.</description>
@@ -145,6 +146,20 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.pluto.container.impl,
+ org.apache.pluto.container.om.portlet.impl,
+ org.apache.pluto.container.om.portlet10.impl,
+ org.apache.pluto.container.util
+ </Export-Package>
+ <Import-Package>javax.ccpp;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Thu Dec 3 08:10:31 2009
@@ -27,6 +27,7 @@
</parent>
<artifactId>pluto-portal-driver-impl</artifactId>
+ <packaging>bundle</packaging>
<name>Apache Pluto Portal Driver Implementation Classes</name>
<dependencies>
@@ -134,6 +135,25 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.pluto.driver.config.impl,
+ org.apache.pluto.driver.services.container,
+ org.apache.pluto.driver.services.impl.resource,
+ org.apache.pluto.driver.url.impl
+ </Export-Package>
+ <Import-Package>javax.ccpp;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- Don't create distribution artifacts -->
<profiles>
<profile>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Thu Dec 3 08:10:31 2009
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
@@ -27,6 +28,7 @@
</parent>
<artifactId>pluto-portal-driver</artifactId>
+ <packaging>bundle</packaging>
<name>Apache Pluto Portal Driver</name>
<dependencies>
@@ -65,17 +67,17 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <!-- CCPP Libraries -->
+ <!-- CCPP Libraries -->
<dependency>
<groupId>javax.ccpp</groupId>
<artifactId>ccpp</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
@@ -123,8 +125,8 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-
- <!-- Testing Libraries ================================================= -->
+
+ <!-- Testing Libraries ================================================= -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
@@ -149,11 +151,26 @@
<build>
<resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
</resource>
- </resources>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>javax.ccpp;resolution:=optional,
+ org.springframework.web.context;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<!-- Don't create distribution artifacts -->
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Thu Dec 3 08:10:31 2009
@@ -27,6 +27,7 @@
</parent>
<artifactId>pluto-taglib</artifactId>
+ <packaging>bundle</packaging>
<name>Apache Pluto Portlet Tag Library</name>
<description>Apache Pluto's Java Portlet Specification Tag Library implementation</description>
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Thu Dec 3 08:10:31 2009
@@ -24,7 +24,9 @@
<groupId>org.apache.portals.pluto</groupId>
<version>2.0.1-SNAPSHOT</version>
</parent>
+
<artifactId>pluto-util</artifactId>
+ <packaging>bundle</packaging>
<name>Apache Pluto Utilities</name>
<!-- The dependencies for the ApplicationServerHook project
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=886700&r1=886699&r2=886700&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Thu Dec 3 08:10:31 2009
@@ -485,13 +485,26 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
Author: djencks
Date: Thu Dec 3 08:06:40 2009
New Revision: 886695
URL: http://svn.apache.org/viewvc?rev=886695&view=rev
Log:
PLUTO-387. Remove page functionality got lost on way to 2.0?
Modified:
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java?rev=886695&r1=886694&r2=886695&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
Thu Dec 3 08:06:40 2009
@@ -28,7 +28,8 @@
*/
public interface RenderConfigAdminService {
- public void addPage(PageConfig config)
- throws DriverConfigurationException;
+ void addPage(PageConfig config) throws DriverConfigurationException;
+ void removePage(PageConfig pageConfig) throws DriverConfigurationException;
+
}
Author: woonsan
Date: Fri Oct 9 10:34:34 2009
New Revision: 823509
URL: http://svn.apache.org/viewvc?rev=823509&view=rev
Log:
PLUTO-580: Allowing portlet descriptors which do not have namespace uris but have version
attributes.
Modified:
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/impl/JaxBDescriptorServiceImplTest.java
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java?rev=823509&r1=823508&r2=823509&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
(original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
Fri Oct 9 10:34:34 2009
@@ -31,6 +31,11 @@
import javax.xml.namespace.NamespaceContext;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.events.XMLEvent;
+import javax.xml.stream.util.StreamReaderDelegate;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -142,28 +147,70 @@
*/
@SuppressWarnings("unchecked")
- public PortletApplicationDefinition read(String name, String contextPath, InputStream
in) throws IOException {
+ public PortletApplicationDefinition read(String name, String contextPath, InputStream
in) throws IOException
+ {
JAXBElement app = null;
- try {
- JAXBContext jc = JAXBContext.newInstance(
- "org.apache.pluto.container.om.portlet10.impl" + ":" +
- "org.apache.pluto.container.om.portlet.impl", PortletAppDescriptorServiceImpl.class.getClassLoader());
-
+
+ try
+ {
+ ClassLoader containerClassLoader = PortletAppDescriptorServiceImpl.class.getClassLoader();
+ JAXBContext jc = JAXBContext.newInstance("org.apache.pluto.container.om.portlet10.impl"
+ ":" +
+ "org.apache.pluto.container.om.portlet.impl",
+ containerClassLoader);
+
+ XMLInputFactory inputFactory = getXMLInputFactory(containerClassLoader);
+ XMLStreamReader streamReader = inputFactory.createXMLStreamReader(in);
+ StreamReaderDelegate delegatingStreamReader = new StreamReaderDelegate(streamReader)
+ {
+ private String adjustedNamespaceURI = null;
+
+ @Override
+ public int next() throws XMLStreamException
+ {
+ int eventCode = super.next();
+ if (eventCode == XMLEvent.START_ELEMENT && "portlet-app".equals(getLocalName()))
+ {
+ String version = getAttributeValue(null, "version");
+ if ("1.0".equals(version))
+ {
+ adjustedNamespaceURI = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";
+ }
+ else if ("2.0".equals(version))
+ {
+ adjustedNamespaceURI = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd";
+ }
+ }
+ return eventCode;
+ }
+
+ @Override
+ public String getNamespaceURI()
+ {
+ String namespaceURI = super.getNamespaceURI();
+ return (namespaceURI != null ? namespaceURI : adjustedNamespaceURI);
+ }
+ };
+
Unmarshaller u = jc.createUnmarshaller();
u.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
- app = (JAXBElement) u.unmarshal(in);
- }catch (JAXBException jaxbEx){
+ app = (JAXBElement) u.unmarshal(delegatingStreamReader);
+ }
+ catch (JAXBException jaxbEx)
+ {
final IOException ioe = new IOException(jaxbEx.getMessage());
ioe.initCause(jaxbEx);
throw ioe;
}
- catch(Exception me) {
+ catch(Exception me)
+ {
final IOException ioe = new IOException(me.getLocalizedMessage());
ioe.initCause(me);
throw new IOException(me.getLocalizedMessage());
}
+
PortletApplicationDefinition pad = null;
+
if (app.getValue() instanceof org.apache.pluto.container.om.portlet10.impl.PortletAppType)
{
pad = ((org.apache.pluto.container.om.portlet10.impl.PortletAppType)app.getValue()).upgrade();
@@ -172,8 +219,10 @@
{
pad = (PortletApplicationDefinition)app.getValue();
}
+
pad.setName(name);
pad.setContextPath(contextPath);
+
return pad;
}
@@ -285,4 +334,34 @@
throw new IOException(me.getLocalizedMessage());
}
}
+
+ /*
+ * Because this service can be invoked from a portlet servlet with its own context class
loader,
+ * <CODE>XMLInputFactory</CODE> should be created while the class loader
switched to the container's.
+ */
+ private XMLInputFactory getXMLInputFactory(ClassLoader classLoader)
+ {
+ XMLInputFactory inputFactory = null;
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+
+ try
+ {
+ if (contextClassLoader != classLoader)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+
+ inputFactory = XMLInputFactory.newInstance();
+ }
+ finally
+ {
+ if (contextClassLoader != classLoader)
+ {
+ Thread.currentThread().setContextClassLoader(contextClassLoader);
+ }
+ }
+
+ return inputFactory;
+ }
+
}
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/impl/JaxBDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/impl/JaxBDescriptorServiceImplTest.java?rev=823509&r1=823508&r2=823509&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/impl/JaxBDescriptorServiceImplTest.java
(original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/impl/JaxBDescriptorServiceImplTest.java
Fri Oct 9 10:34:34 2009
@@ -20,15 +20,17 @@
import java.io.IOException;
import java.io.InputStream;
+import javax.xml.parsers.ParserConfigurationException;
+
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.pluto.container.impl.PortletAppDescriptorServiceImpl;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.xml.sax.SAXException;
/**
* Testclass for testing jaxb xml 2 java binding (portlet.xml)
@@ -37,11 +39,13 @@
public class JaxBDescriptorServiceImplTest extends TestCase{
private StringBuffer xmlBegin286 = new StringBuffer();
+ private StringBuffer xmlBegin286NoNamespaceURI = new StringBuffer();
private StringBuffer portlet286 = new StringBuffer();
private StringBuffer attrs286 = new StringBuffer();
private StringBuffer xmlEnd = new StringBuffer();
private StringBuffer xmlBegin168 = new StringBuffer();
+ private StringBuffer xmlBegin168NoNamespaceURI = new StringBuffer();
private StringBuffer portlet168 = new StringBuffer();
private StringBuffer attrs168 = new StringBuffer();
@@ -64,6 +68,9 @@
"xmlns:portlet=\"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd\"\n" +
"xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd\n" +
"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd\">\n ");
+ xmlBegin286NoNamespaceURI.append("" +
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<portlet-app id=\"id1\" version=\"2.0\">");
portlet286.append(""+
"<portlet id=\"id2\">\n" +
"<description xml:lang=\"de\">description</description>\n" +
@@ -184,6 +191,9 @@
"xmlns:portlet=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\"\n" +
"xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\n" +
"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\">\n ");
+ xmlBegin168NoNamespaceURI.append("" +
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<portlet-app id=\"id1\" version=\"1.0\">");
portlet168.append(""+
"<portlet id=\"id2\">\n" +
"<description xml:lang=\"de\">description</description>\n" +
@@ -313,66 +323,109 @@
in = new ByteArrayInputStream(xml168.toString().getBytes());
PortletApplicationDefinition portletApp168 = jaxb.read("test", "/test", in);
- // test if portlet has the right params:
-
- // test jsr168 compliant portlets
- PortletDefinition portlet168 = (PortletDefinition)portletApp168.getPortlets().get(0);
- assertTrue(portlet168.getExpirationCache()==50);
- assertEquals(portlet168.getPortletName(),"portlet168");
- assertEquals(portlet168.getInitParams().get(0).getParamValue(),"value");
- assertEquals(portlet168.getSecurityRoleRefs().get(0).getRoleLink(), "role-link");
- assertEquals(portletApp168.getCustomPortletModes().get(0).getPortletMode(), "portlet-mode");
- assertEquals(portletApp168.getCustomWindowStates().get(0).getWindowState(), "window-state");
- assertEquals(portletApp168.getUserAttributes().get(0).getName(), "name" );
- assertEquals(portletApp168.getSecurityConstraints().get(0).getPortletNames().get(0), "portlet-name");
- assertEquals(portlet168.getExpirationCache(), 50);
- // id (isn't supported yet)
-// assertFalse(portletApp.getId().equals("id2"));
-// assertTrue(portletApp.getId().equals("id1"));
-
- jaxb.write(portletApp168, System.out);
- // portlet id
- PortletDefinition portlet286 = (PortletDefinition)portletApp286.getPortlets().get(0);
-// assertTrue(portlet1.getId().equals("id2"));
-
- // portlet class
- assertTrue(portlet286.getPortletClass().equals("portlet-class"));
-
- // portlet info
- // id isn't supported yet
-// assertTrue(portlet1.getPortletInfo().getId().equals("info1"));
- assertTrue(portlet286.getPortletInfo().getTitle().equals("title"));
-
- assertEquals("supports size should be 3", 3, portlet286.getSupports().size());
-
- assertEquals(portletApp286.getCustomPortletModes().get(0).getPortletMode(), "portlet-mode");
- assertEquals(portletApp286.getCustomWindowStates().get(0).getWindowState(), "window-state");
- assertEquals(portletApp286.getUserAttributes().get(0).getName(), "name" );
- assertEquals(portletApp286.getSecurityConstraints().get(0).getPortletNames().get(0), "portlet-name");
- assertEquals(portletApp286.getEventDefinitions().get(0).getValueType(), "java-class");
-// assertEquals(portletApp286.getRender().get(0).getName(), "QName");
- assertEquals(portletApp286.getFilters().get(0).getLifecycles().get(0), "lifecycle");
- assertEquals(portletApp286.getFilterMappings().get(0).getPortletNames().get(0), "portlet-name");
- assertEquals(portletApp286.getResourceBundle(), "resource-bundle");
- assertEquals(portletApp286.getVersion(), "2.0");
-
- // test container runtime options
- assertEquals(portletApp286.getContainerRuntimeOptions().size(),1);
- assertEquals(portletApp286.getContainerRuntimeOptions().get(0).getName(),"Runtime-Option-Portlet-App");
- assertEquals(portletApp286.getContainerRuntimeOptions().get(0).getValues().get(0),"false");
-
- assertEquals(portlet286.getContainerRuntimeOptions().size(),1);
- assertEquals(portlet286.getContainerRuntimeOptions().get(0).getName(),"Runtime-Option");
- assertEquals(portlet286.getContainerRuntimeOptions().get(0).getValues().get(0),"true");
- assertEquals(portlet286.getExpirationCache(), 100);
-
- jaxb.write(portletApp286, System.out);
+ validatePortletApp168AndPortletApp286(portletApp168, portletApp286);
} catch (IOException e) {
- fail("exception was thrown");
+ fail("exception was thrown: " + e);
}
+
}
+ /**
+ * Test method for {@link org.apache.pluto.descriptors.services.jaxb.JaxBDescriptorServiceImpl#read(java.net.URL)}
+ * with descriptors not having namespace.
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ */
+ @Test
+ public void testReadNoNamespaceURI() throws IOException, ParserConfigurationException,
SAXException {
+
+ try {
+
+ StringBuffer xml286NoNamespaceURI = new StringBuffer()
+ .append(xmlBegin286NoNamespaceURI).append(portlet286)
+ .append(attrs286).append(xmlEnd);
+
+ StringBuffer xml168NoNamespaceURI = new StringBuffer()
+ .append(xmlBegin168NoNamespaceURI).append(portlet168)
+ .append(attrs168).append(xmlEnd);
+
+ InputStream in = new ByteArrayInputStream(xml286NoNamespaceURI.toString().getBytes());
+
+ PortletApplicationDefinition portletApp286NoNamespaceURI = jaxb.read("test",
"/test", in);
+
+ in = new ByteArrayInputStream(xml168NoNamespaceURI.toString().getBytes());
+ PortletApplicationDefinition portletApp168NoNamespaceURI = jaxb.read("test",
"/test", in);
+
+ validatePortletApp168AndPortletApp286(portletApp168NoNamespaceURI, portletApp286NoNamespaceURI);
+
+ } catch (IOException e) {
+ fail("exception was thrown: " + e);
+ }
+
+ }
+
+ /**
+ * Validates if portlet has the right params for {@link #testRead()} and {@link #testReadNoNamespaceURI()}.
+ * @param portletApp168
+ * @param portletApp286
+ * @throws IOException
+ */
+ private void validatePortletApp168AndPortletApp286(PortletApplicationDefinition portletApp168,
PortletApplicationDefinition portletApp286) throws IOException {
+ // test jsr168 compliant portlets
+ PortletDefinition portlet168 = (PortletDefinition)portletApp168.getPortlets().get(0);
+ assertTrue(portlet168.getExpirationCache()==50);
+ assertEquals(portlet168.getPortletName(),"portlet168");
+ assertEquals(portlet168.getInitParams().get(0).getParamValue(),"value");
+ assertEquals(portlet168.getSecurityRoleRefs().get(0).getRoleLink(), "role-link");
+ assertEquals(portletApp168.getCustomPortletModes().get(0).getPortletMode(), "portlet-mode");
+ assertEquals(portletApp168.getCustomWindowStates().get(0).getWindowState(), "window-state");
+ assertEquals(portletApp168.getUserAttributes().get(0).getName(), "name" );
+ assertEquals(portletApp168.getSecurityConstraints().get(0).getPortletNames().get(0),
"portlet-name");
+ assertEquals(portlet168.getExpirationCache(), 50);
+ // id (isn't supported yet)
+// assertFalse(portletApp.getId().equals("id2"));
+// assertTrue(portletApp.getId().equals("id1"));
+
+ jaxb.write(portletApp168, System.out);
+ // portlet id
+ PortletDefinition portlet286 = (PortletDefinition)portletApp286.getPortlets().get(0);
+// assertTrue(portlet1.getId().equals("id2"));
+
+ // portlet class
+ assertTrue(portlet286.getPortletClass().equals("portlet-class"));
+
+ // portlet info
+ // id isn't supported yet
+// assertTrue(portlet1.getPortletInfo().getId().equals("info1"));
+ assertTrue(portlet286.getPortletInfo().getTitle().equals("title"));
+
+ assertEquals("supports size should be 3", 3, portlet286.getSupports().size());
+
+ assertEquals(portletApp286.getCustomPortletModes().get(0).getPortletMode(), "portlet-mode");
+ assertEquals(portletApp286.getCustomWindowStates().get(0).getWindowState(), "window-state");
+ assertEquals(portletApp286.getUserAttributes().get(0).getName(), "name" );
+ assertEquals(portletApp286.getSecurityConstraints().get(0).getPortletNames().get(0),
"portlet-name");
+ assertEquals(portletApp286.getEventDefinitions().get(0).getValueType(), "java-class");
+// assertEquals(portletApp286.getRender().get(0).getName(), "QName");
+ assertEquals(portletApp286.getFilters().get(0).getLifecycles().get(0), "lifecycle");
+ assertEquals(portletApp286.getFilterMappings().get(0).getPortletNames().get(0), "portlet-name");
+ assertEquals(portletApp286.getResourceBundle(), "resource-bundle");
+ assertEquals(portletApp286.getVersion(), "2.0");
+
+ // test container runtime options
+ assertEquals(portletApp286.getContainerRuntimeOptions().size(),1);
+ assertEquals(portletApp286.getContainerRuntimeOptions().get(0).getName(),"Runtime-Option-Portlet-App");
+ assertEquals(portletApp286.getContainerRuntimeOptions().get(0).getValues().get(0),"false");
+
+ assertEquals(portlet286.getContainerRuntimeOptions().size(),1);
+ assertEquals(portlet286.getContainerRuntimeOptions().get(0).getName(),"Runtime-Option");
+ assertEquals(portlet286.getContainerRuntimeOptions().get(0).getValues().get(0),"true");
+ assertEquals(portlet286.getExpirationCache(), 100);
+
+ jaxb.write(portletApp286, System.out);
+ }
+
/**
* Test method for {@link org.apache.pluto.descriptors.services.jaxb.JaxBDescriptorServiceImpl#writePortletApp(com.sun.java.xml.ns.portlet.portlet_app_2_0_xsd.PortletAppType,
java.io.OutputStream)}.
*/
@@ -411,5 +464,5 @@
PortletDefinition pd = (PortletDefinition) portletDD.getPortlets().get( 0 );
assertEquals( pd.getExpirationCache(), 0 );
}
-
+
}
Author: djencks
Date: Thu Sep 24 00:49:31 2009
New Revision: 818332
URL: http://svn.apache.org/viewvc?rev=818332&view=rev
Log:
PLUTO-579 Um, StringBuilder not available in jdk 1.4
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?rev=818332&r1=818331&r2=818332&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
(original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
Thu Sep 24 00:49:31 2009
@@ -91,8 +91,8 @@
ENCODING_MAP.put(ESCAPE_STRING, ESCAPE_STRING + ESCAPE_STRING);
DECODING_MAP.put(ESCAPE_STRING + ESCAPE_STRING , ESCAPE_STRING);
- StringBuilder encodingPatternBuilder = new StringBuilder();
- StringBuilder decodingPatternBuilder = new StringBuilder();
+ StringBuffer encodingPatternBuilder = new StringBuffer();
+ StringBuffer decodingPatternBuilder = new StringBuffer();
encodingPatternBuilder.append(ESCAPE_STRING);
decodingPatternBuilder.append(ESCAPE_STRING + ESCAPE_STRING);
Author: djencks
Date: Thu Sep 24 00:43:25 2009
New Revision: 818328
URL: http://svn.apache.org/viewvc?rev=818328&view=rev
Log:
PLUTO-579 Escape more characters and use a faster encoding/decoding method in PortalURLParserImpl.
Patch from Ivan, modified for jdk 1.4
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?rev=818328&r1=818327&r2=818328&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
(original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
Thu Sep 24 00:43:25 2009
@@ -18,20 +18,21 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.url.PortalURLParameter;
import org.apache.pluto.driver.url.PortalURLParser;
-import org.apache.pluto.util.StringUtils;
/**
* @version 1.0
@@ -72,7 +73,41 @@
new String[] { "?", "0xa" },
new String[] { "\\", "0xb" },
new String[] { "%", "0xc" },
+ new String[] { ";", "0xd" },
+ new String[] { "0x0", "0xe" }
};
+
+ private static Map ENCODING_MAP = new HashMap();
+
+ private static Map DECODING_MAP = new HashMap();
+
+ private static final Pattern ENCODING_PATTERN;
+
+ private static final Pattern DECODING_PATTERN;
+
+ private static String ESCAPE_STRING = "0xz";
+
+ static {
+ ENCODING_MAP.put(ESCAPE_STRING, ESCAPE_STRING + ESCAPE_STRING);
+ DECODING_MAP.put(ESCAPE_STRING + ESCAPE_STRING , ESCAPE_STRING);
+
+ StringBuilder encodingPatternBuilder = new StringBuilder();
+ StringBuilder decodingPatternBuilder = new StringBuilder();
+ encodingPatternBuilder.append(ESCAPE_STRING);
+ decodingPatternBuilder.append(ESCAPE_STRING + ESCAPE_STRING);
+
+ for (int i = 0; i < ENCODINGS.length; i++) {
+ ENCODING_MAP.put(ENCODINGS[i][0], ENCODINGS[i][1]);
+ ENCODING_MAP.put(ENCODINGS[i][1], ESCAPE_STRING + ENCODINGS[i][1]);
+ DECODING_MAP.put(ENCODINGS[i][1], Matcher.quoteReplacement(ENCODINGS[i][0]));
+ DECODING_MAP.put(ESCAPE_STRING + ENCODINGS[i][1], ENCODINGS[i][1]);
+
+ encodingPatternBuilder.append("|" + Pattern.quote(ENCODINGS[i][0]) + "|" + ENCODINGS[i][1]);
+ decodingPatternBuilder.append("|(" + ESCAPE_STRING + ")?" + ENCODINGS[i][1]);
+ }
+ ENCODING_PATTERN = Pattern.compile(encodingPatternBuilder.toString());
+ DECODING_PATTERN = Pattern.compile(decodingPatternBuilder.toString());
+ }
// Constructor -------------------------------------------------------------
@@ -195,7 +230,7 @@
// Start the pathInfo with the path to the render URL (page).
if (portalURL.getRenderPath() != null) {
- buffer.append("/").append(portalURL.getRenderPath());
+ buffer.append(portalURL.getRenderPath().startsWith("/") ? "" : "/").append(portalURL.getRenderPath());
}
// Append the action window definition, if it exists.
@@ -306,12 +341,12 @@
private String encodeMultiValues(String[] values) {
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < values.length; i++) {
- buffer.append(values[i] != null ? values[i] : "");
+ buffer.append(values[i] != null ? encodeCharacters(values[i]) : "");
if (i + 1 < values.length) {
buffer.append(VALUE_DELIM);
}
}
- return encodeCharacters(buffer.toString());
+ return buffer.toString();
}
/**
@@ -320,12 +355,13 @@
* @return the encoded string.
*/
private String encodeCharacters(String string) {
- for (int i = 0; i < ENCODINGS.length; i++) {
- string = StringUtils.replace(string,
- ENCODINGS[i][0],
- ENCODINGS[i][1]);
+ Matcher matcher = ENCODING_PATTERN.matcher(string);
+ StringBuffer buffer = new StringBuffer();
+ while (matcher.find()) {
+ matcher.appendReplacement(buffer, (String)ENCODING_MAP.get(matcher.group()));
}
- return string;
+ matcher.appendTail(buffer);
+ return buffer.toString();
}
@@ -380,12 +416,13 @@
// Decode special characters in window ID and parameter value.
windowId = decodeCharacters(windowId);
- if (value != null) {
- value = decodeCharacters(value);
- }
-
+
// Split multiple values into a value array.
String[] paramValues = value.split(VALUE_DELIM);
+
+ for(int i=0;i<paramValues.length;i++) {
+ paramValues[i] = decodeCharacters(paramValues[i]);
+ }
// Construct portal URL parameter and return.
return new PortalURLParameter(windowId, paramName, paramValues);
@@ -396,13 +433,14 @@
* @param string the string value to decode.
* @return the decoded string.
*/
- private String decodeCharacters(String string) {
- for (int i = 0; i < ENCODINGS.length; i++) {
- string = StringUtils.replace(string,
- ENCODINGS[i][1],
- ENCODINGS[i][0]);
+ private String decodeCharacters(String string) {
+ Matcher matcher = DECODING_PATTERN.matcher(string);
+ StringBuffer buffer = new StringBuffer();
+ while (matcher.find()) {
+ matcher.appendReplacement(buffer, (String)DECODING_MAP.get(matcher.group()));
}
- return string;
+ matcher.appendTail(buffer);
+ return buffer.toString();
}
}
Author: cziegeler
Date: Tue May 19 11:36:50 2009
New Revision: 776278
URL: http://svn.apache.org/viewvc?rev=776278&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/pluto-ant-tasks/pom.xml
portals/pluto/trunk/pluto-container-api/pom.xml
portals/pluto/trunk/pluto-container-driver-api/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>maven-pluto-plugin</artifactId>
Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-ant-tasks</artifactId>
Modified: portals/pluto/trunk/pluto-container-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-api/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-container-api</artifactId>
Modified: portals/pluto/trunk/pluto-container-driver-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-driver-api/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-driver-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-driver-api/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-container-driver-api</artifactId>
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-container</artifactId>
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-portal-driver-impl</artifactId>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-portal-driver</artifactId>
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-portal</artifactId>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-taglib</artifactId>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Tue May 19 11:36:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-testsuite</artifactId>
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Tue May 19 11:36:50 2009
@@ -22,7 +22,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.portals.pluto</groupId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
</parent>
<artifactId>pluto-util</artifactId>
<name>Apache Pluto Utilities</name>
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=776278&r1=776277&r2=776278&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue May 19 11:36:50 2009
@@ -41,7 +41,7 @@
in testsuite module (src/main/webapp/WEB-INF/classes)
5. pluto.version in Ant build file dist-build.xml.
-->
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<!-- Due to a bug in maven 2.0, the description must not contain any line breaks or
tabs. -->
<description>Apache Pluto is the Reference Implementation of the Java Portlet Specification.</description>
<url>http://portals.apache.org/pluto</url>
@@ -219,9 +219,9 @@
</contributors>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/tags/pluto-2.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-2.0.0</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/pluto/tags/pluto-2.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/pluto/trunk</url>
</scm>
<!-- Dependency Version Properties ======================================= -->
Author: cziegeler
Date: Tue May 19 11:36:38 2009
New Revision: 776277
URL: http://svn.apache.org/viewvc?rev=776277&view=rev
Log:
[maven-scm] copy for tag pluto-2.0.0
Added:
portals/pluto/tags/pluto-2.0.0/
- copied from r776276, portals/pluto/trunk/
Author: cziegeler
Date: Tue May 19 11:36:27 2009
New Revision: 776276
URL: http://svn.apache.org/viewvc?rev=776276&view=rev
Log:
[maven-release-plugin] prepare release pluto-2.0.0
Modified:
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/pluto-ant-tasks/pom.xml
portals/pluto/trunk/pluto-container-api/pom.xml
portals/pluto/trunk/pluto-container-driver-api/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>maven-pluto-plugin</artifactId>
Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-ant-tasks</artifactId>
Modified: portals/pluto/trunk/pluto-container-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-api/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-container-api</artifactId>
Modified: portals/pluto/trunk/pluto-container-driver-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-driver-api/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-driver-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-driver-api/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-container-driver-api</artifactId>
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-container</artifactId>
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-portal-driver-impl</artifactId>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-portal-driver</artifactId>
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-portal</artifactId>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-taglib</artifactId>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Tue May 19 11:36:27 2009
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-testsuite</artifactId>
@@ -166,9 +164,9 @@
on the command line when invoking maven:
mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
-->
- <property environment="env"/>
- <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
- <copy file="target/${pom.build.finalName}.war"
tofile="${deploy.dir}/testsuite.war"/>
+ <property environment="env" />
+ <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"
/>
+ <copy file="target/${pom.build.finalName}.war"
tofile="${deploy.dir}/testsuite.war" />
</tasks>
</configuration>
<goals>
@@ -203,9 +201,9 @@
on the command line when invoking maven:
mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
-->
- <property environment="env"/>
- <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
- <copy file="target/${pom.build.finalName}.war"
tofile="${deploy.dir}/testsuite.war"/>
+ <property environment="env" />
+ <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"
/>
+ <copy file="target/${pom.build.finalName}.war"
tofile="${deploy.dir}/testsuite.war" />
</tasks>
</configuration>
<goals>
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Tue May 19 11:36:27 2009
@@ -22,7 +22,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.portals.pluto</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>pluto-util</artifactId>
<name>Apache Pluto Utilities</name>
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=776276&r1=776275&r2=776276&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue May 19 11:36:27 2009
@@ -41,7 +41,7 @@
in testsuite module (src/main/webapp/WEB-INF/classes)
5. pluto.version in Ant build file dist-build.xml.
-->
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<!-- Due to a bug in maven 2.0, the description must not contain any line breaks or
tabs. -->
<description>Apache Pluto is the Reference Implementation of the Java Portlet Specification.</description>
<url>http://portals.apache.org/pluto</url>
@@ -219,9 +219,9 @@
</contributors>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/pluto/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/tags/pluto-2.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-2.0.0</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/pluto/tags/pluto-2.0.0</url>
</scm>
<!-- Dependency Version Properties ======================================= -->
Author: ate
Date: Tue May 19 11:18:07 2009
New Revision: 776273
URL: http://svn.apache.org/viewvc?rev=776273&view=rev
Log:
Temporary fix for http://jira.codehaus.org/browse/MASSEMBLY-409 by using a custom assembly
descriptor.
This turned out to be more difficult than expected because the portals-pom-1.2 already configures
the "project" predefined assemby and the maven-assembly-plugin
always merges descriptor configurations :(
"Fixed" by configuring a "dummy-does-not-exist" predefined descriptor (which then does override
the "project") *and* configuring ignoreMissingDescriptor=true
Note: this still needs to be tested with mvn release:prepare -DdryRun=true, but to be able
to do so this change needs to be committed first.
Added:
portals/pluto/trunk/src/
portals/pluto/trunk/src/main/
portals/pluto/trunk/src/main/assembly/
portals/pluto/trunk/src/main/assembly/project-src.xml (with props)
Modified:
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=776273&r1=776272&r2=776273&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue May 19 11:18:07 2009
@@ -525,8 +525,24 @@
<build>
<plugins>
<plugin>
- <!-- only include this in top level project poms -->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <!-- "hack" to make it possible to override portals-pom-1.2
configuration using
+ descriptorRef "project" which (with the current version
of the plugin
+ doesn't produce what we need.
+ This "hack" also requires setting ignoreMissingDescriptor=true
(below)
+ See also: http://jira.codehaus.org/browse/MASSEMBLY-409
+ -->
+ <descriptorRefs>
+ <descriptorRef>dummy-does-not-exist</descriptorRef>
+ </descriptorRefs>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
+ <!-- our custom assembly descriptor producing -src archives
and excludes velocity.log -->
+ <descriptors>
+ <descriptor>src/main/assembly/project-src.xml</descriptor>
+ </descriptors>
+ </configuration>
</plugin>
</plugins>
</build>
Added: portals/pluto/trunk/src/main/assembly/project-src.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/src/main/assembly/project-src.xml?rev=776273&view=auto
==============================================================================
--- portals/pluto/trunk/src/main/assembly/project-src.xml (added)
+++ portals/pluto/trunk/src/main/assembly/project-src.xml Tue May 19 11:18:07 2009
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>velocity.log</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: portals/pluto/trunk/src/main/assembly/project-src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/src/main/assembly/project-src.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/pluto/trunk/src/main/assembly/project-src.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Author: cziegeler
Date: Tue May 19 09:31:01 2009
New Revision: 776248
URL: http://svn.apache.org/viewvc?rev=776248&view=rev
Log:
Add missing assembly configuration.
Modified:
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=776248&r1=776247&r2=776248&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue May 19 09:31:01 2009
@@ -518,4 +518,18 @@
<module>maven-pluto-plugin</module>
<module>pluto-ant-tasks</module>
</modules>
-</project>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- only include this in top level project poms -->
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ </project>
Author: ate
Date: Mon May 18 23:15:24 2009
New Revision: 776131
URL: http://svn.apache.org/viewvc?rev=776131&view=rev
Log:
Adding rat exclusions for third party LICENSE files
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=776131&r1=776130&r2=776131&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 23:15:24 2009
@@ -187,5 +187,22 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>src/main/webapp/META-INF/SLF4J-LICENSE</exclude>
+ <exclude>src/main/webapp/META-INF/JAXB-LICENSE</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=776131&r1=776130&r2=776131&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 23:15:24 2009
@@ -233,5 +233,21 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>src/main/webapp/META-INF/SLF4J-LICENSE</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Author: cziegeler
Date: Mon May 18 16:15:07 2009
New Revision: 776001
URL: http://svn.apache.org/viewvc?rev=776001&view=rev
Log:
Include license files in tomcat dist.
Modified:
portals/pluto/trunk/dist-build.xml
Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?rev=776001&r1=776000&r2=776001&view=diff
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Mon May 18 16:15:07 2009
@@ -95,16 +95,16 @@
<arg line="clean:clean"/>
</exec>
<mkdir dir="${dist.basedir}"/>
-
+
<get src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${tomcat.full.version}/bin/${base.name}.tar.gz"
dest="${unzip.file}"
/>
-
+
<gunzip src="${unzip.file}"
dest="${dist.basedir}"
description="Creates tar from tar.gz tomcat dist"
/>
-
+
<untar src="${tar.file}"
dest="${dist.basedir}"
description="Untars tomcat dist"
@@ -113,7 +113,19 @@
<!-- Copy over README -->
<copy file="README" todir="${dist.dir}"/>
- <!-- Add emptySessionPath="true" to Connector element in server.xml -->
+ <!-- Copy over additional licenses from pluto and testsuite web app-->
+ <copy todir="${dist.dir}" flatten="true">
+ <fileset dir="${basedir}/pluto-testsuite">
+ <include name="src/main/webapp/META-INF/*-LICENSE"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.dir}" flatten="true">
+ <fileset dir="${basedir}/pluto-portal">
+ <include name="src/main/webapp/META-INF/*-LICENSE"/>
+ </fileset>
+ </copy>
+
+ <!-- Add emptySessionPath="true" to Connector element in server.xml -->
<replace file="${dist.dir}/conf/server.xml"
token="redirectPort="8443" />"
value="redirectPort="8443" emptySessionPath="true"
/>"
Author: ate
Date: Mon May 18 15:48:35 2009
New Revision: 775995
URL: http://svn.apache.org/viewvc?rev=775995&view=rev
Log:
Removing build <finalName> configuration as it interferes with the release process and
isn't needed anyway.
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775995&r1=775994&r2=775995&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 15:48:35 2009
@@ -121,7 +121,6 @@
</dependencies>
<build>
- <finalName>pluto-portal</finalName>
<plugins>
<plugin>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775995&r1=775994&r2=775995&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 15:48:35 2009
@@ -82,7 +82,6 @@
<!-- Build configuration -->
<build>
- <finalName>pluto-testsuite</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
Author: cziegeler
Date: Mon May 18 15:37:06 2009
New Revision: 775992
URL: http://svn.apache.org/viewvc?rev=775992&view=rev
Log:
Add missing license files
Added:
portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/
portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/JAXB-LICENSE
portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/SLF4J-LICENSE
portals/pluto/trunk/pluto-testsuite/src/main/webapp/META-INF/
portals/pluto/trunk/pluto-testsuite/src/main/webapp/META-INF/SLF4J-LICENSE
Added: portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/JAXB-LICENSE
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/JAXB-LICENSE?rev=775992&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/JAXB-LICENSE (added)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/JAXB-LICENSE Mon May 18 15:37:06
2009
@@ -0,0 +1 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
1. Definitions.
1.1. "Contributor"
means each individual or entity that creates
or contributes to the creation of Modifications.
1.2. "Contributor Version" means the combination of the Original
Software, prior
Modifications used by a Contributor (if any),
and the Modifications made by that
particular Contributor.
1.3. "Covered Software" means (a) the Original Software, or (b)
Modifications, or (c) the combination of files containing
Original Software
with files containing Modifications, in
each case including portions thereof.
1.4. "Executable" means the Covered Software in any form other
than Source Code.
1.5. "Initial Developer" means the individual or entity that first
makes Original
Software available under this License.
1.6. "Larger Work" means a work which combines
Covered Software or
portions thereof wi
th code not governed by the terms of this
License.
1.7. "License" means this
document.
1.8. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired,
any and all of the rights conveyed
herein.
1.9. "Modifications" means the Source
Code and Executable form of
any of the following:
A. Any file that results
from an addition to, deletion from or
modification of the contents of a file containing
Original
Software or previous Modifications;
B. Any new file that contains
any part of the Original
Software or previous Modifications; or
C. Any
new file that is contributed or otherwise made
available under the terms of this
License.
1.10. "Original Software" means the Source Code and Executable
form
of computer software code that is originally released
under this License.
1.11. "Patent Claims" means any patent claim(s), now owned
or
hereafter acquired, including without limitation, method,
process,
and apparatus claims, in any patent Licensable by
grantor.
1.12. "Source Code"
means (a) the common form of computer software
code in which modifications are made
and (b) associated
documentation included in or with such code.
1.13. "You"
(or "Your") means an individual or a legal entity
exercising rights under, and complying
with all of the terms
of, this License. For legal entities, "You" includes any
entity which controls, is controlled by, or is under common
control with
You. For purposes of this definition,
"control" means (a) the power, direct or
indirect, to cause
the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty
percent (50%) of the outstanding shares or beneficial
ownership of such entity.
2.
License Grants.
2.1. The Initial Developer Grant.
Conditioned upon Your compliance
with Section 3.1 below and
subject to third party intellectual property claims, the Initial
Developer hereby grants You a world-wide, royalty-free,
non-exclusive license:
(a) under intellectual property rights (other than patent or
trademark) Licensable
by Initial Developer, to use,
reproduce, modify, display, perform, sublicense
and
distribute the Original Software (or portions thereof),
with or
without Modifications, and/or as part of a Larger
Work; and
(b) under
Patent Claims infringed by the making, using or
selling of Original Software,
to make, have made, use,
practice, sell, and offer for sale, and/or otherwise
dispose of the Original Software (or portions
thereof).
(c) The licenses granted in Sections 2.1(a) and (b) are
effective
on the date Initial Developer first distributes
or otherwise makes the Original
Software available to a
third party under the terms of this License.
(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: (1) for
code that You delete from the Original
Software, or (2) for infringements caused
by: (i) the
modification of the Original Software, or (ii) the
combination
of the Original Software with other software
or devices.
2.2. Contributor
Grant.
Conditioned upon Your compliance with Section 3.1 below and
subject to third
party intellectual property claims, each
Contributor hereby grants You a world-wide, royalty-free,
non-exclusive license:
(a) under intellectual property rights (other than patent
or
trademark) Licensable by Cont
ributor to use, reproduce,
modify, display, perform, sublicense and distribute
the
Modifications created by such Contributor (or portions
thereof),
either on an unmodified basis, with other
Modifications, as Covered Software and/or
as part of a
Larger Work; and
(b) under Patent Claims infringed by the
making, using, or
selling of Modifications made by that Contributor either
alone and/or in combination with its Contributor Version
(or portions
of such combination), to make, use, sell,
offer for sale, have made, and/or otherwise
dispose of:
(1) Modifications made by that Contributor (or portions
thereof); and (2) the combination of Modifications made by
that Contributor
with its Contributor Version (or portions
of such combination).
(c) The
licenses granted in Sections 2.2(a) and 2.2(b) are
ef
fective on the date Contributor first distributes or
otherwise makes the Modifications
available to a third
party.
(d) Notwithstanding Section 2.2(b) above,
no patent license is
granted: (1) for any code that Contributor has deleted
from the Contributor Version; (2) for infringements caused
by: (i) third
party modifications of Contributor Version,
or (ii) the combination of Modifications
made by that
Contributor with other software (except as part of the
Contributor Version) or other devices; or (3) under Patent
Claims infringed
by Covered Software in the absence of
Modifications made by that Contributor.
3.
Distribution Obligations.
3.1. Availability of Source Code.
Any Covered Software
that You distribute or otherwise make
available in Executable form must also be made available
in Source
Code form and that Source Code form mus
t be distributed only under
the terms of this License. You must include a copy of this
License with every copy of the Source Code form of the Covered
Software You distribute
or otherwise make available. You must
inform recipients of any such Covered Software
in Executable form
as to how they can obtain such Covered Software in Source Code
form in a reasonable manner on or through a medium customarily
used for software exchange.
3.2. Modifications.
The Modifications that You create or to which You contribute are
governed by the terms of this License. You represent that You
believe Your Modifications
are Your original creation(s) and/or
You have sufficient rights to grant the rights conveyed
by this
License.
3.3. Required Notices.
You must include a notice in each of
Your Modifications that
identifies You as the Contributor of the Modification. You may
not remove or alter any copyright, patent or trade
mark notices
contained within the Covered Software, or any notices of licensing
or
any descriptive text giving attribution to any Contributor or
the Initial Developer.
3.4. Application of Additional Terms.
You may not offer or impose any terms on any
Covered Software in
Source Code form that alters or restricts the applicable version
of this License or the recipients' rights hereunder. You may
choose to offer, and
to charge a fee for, warranty, support,
indemnity or liability obligations to one or more
recipients of
Covered Software. However, you may do so only on Your own behalf,
and
not on behalf of the Initial Developer or any Contributor.
You must make it absolutely
clear that any such warranty, support,
indemnity or liability obligation is offered by
You alone, and You
hereby agree to indemnify the Initial Developer and every
Contributor
for any liability incurred by the Initial Developer or
such Contri
butor as a result of warranty, support, indemnity or
liability terms You offer.
3.5. Distribution of Executable Versions.
You may distribute the Executable form of the
Covered Software
under the terms of this License or under the terms of a license of
Your choice, which may contain terms different from this License,
provided that You
are in compliance with the terms of this License
and that the license for the Executable
form does not attempt to
limit or alter the recipient's rights in the Source Code form
from
the rights set forth in this License. If You distribute the
Covered Software
in Executable form under a different license, You
must make it absolutely clear that any
terms which differ from
this License are offered by You alone, not by the Initial
Developer or Contributor. You hereby agree to indemnify the
Initial Developer and every
Contributor for any liability incurred
by the Initial Developer or such
Contributor as a result of any
such terms You offer.
3.6. Larger Works.
You
may create a Larger Work by combining Covered Software with
other code not governed by
the terms of this License and
distribute the Larger Work as a single product. In such
a case,
You must make sure the requirements of this License are fulfilled
for the
Covered Software.
4. Versions of the License.
4.1. New Versions.
Sun Microsystems,
Inc. is the initial license steward and may
publish revised and/or new versions of this
License from time to
time. Each version will be given a distinguishing version number.
Except as provided in Section 4.3, no one other than the license
steward has the right
to modify this License.
4.2. Effect of New Versions.
You may always continue to
use, distribute or otherwise make the
Covered Software available under the terms of the
version of the
License under which You originally received the Cover
ed Software.
If the Initial Developer includes a notice in the Original
Software
prohibiting it from being distributed or otherwise made
available under any subsequent
version of the License, You must
distribute and make the Covered Software available under
the terms
of the version of the License under which You originally received
the Covered
Software. Otherwise, You may also choose to use,
distribute or otherwise make the Covered
Software available under
the terms of any subsequent version of the License published
by
the license steward.
4.3. Modified Versions.
When You are an Initial Developer
and You want to create a new
license for Your Original Software, You may create and use
a
modified version of this License if You: (a) rename the license
and remove any references
to the name of the license steward
(except to note that the license differs from this
License); and
(b) otherwise make it clear that the l
icense contains terms which
differ from this License.
5. DISCLAIMER OF WARRANTY.
COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
BASIS, WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT
THE COVERED
SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
PURPOSE
OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
PERFORMANCE OF THE COVERED SOFTWARE
IS WITH YOU. SHOULD ANY
COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
NECESSARY SERVICING,
REPAIR OR CORRECTION. THIS DISCLAIMER OF
WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
LICENSE. NO USE OF
ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
DISCLAIMER.
6. TERMINATION.
6.1. This License and the rights granted hereunder will
terminate
automatically if You fail to comply with terms her
ein and fail to
cure such breach within 30 days of becoming aware of the breach.
Provisions which, by their nature, must remain in effect beyond
the termination of this
License shall survive.
6.2. If You assert a patent infringement claim (excluding
declaratory judgment actions) against Initial Developer or a
Contributor (the Initial
Developer or Contributor against whom You
assert such claim is referred to as "Participant")
alleging that
the Participant Software (meaning the Contributor Version where
the
Participant is a Contributor or the Original Software where
the Participant is the Initial
Developer) directly or indirectly
infringes any patent, then any and all rights granted
directly or
indirectly to You by such Participant, the Initial Developer (if
the Initial
Developer is not the Participant) and all Contributors
under Sections 2.1 and/or 2.2 of
this License shall, upon 60 days
notice from Participant term
inate prospectively and automatically
at the expiration of such 60 day notice period,
unless if within
such 60 day period You withdraw Your claim with respect to the
Participant
Software against such Participant either unilaterally
or pursuant to a written agreement
with Participant.
6.3. In the event of termination under Sections 6.1 or 6.2 above,
all end user licenses that have been validly granted by You or any
distributor hereunder
prior to termination (excluding licenses
granted to You by any distributor) shall survive
termination.
7. LIMITATION OF LIABILITY.
UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
WHETHER TORT
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
INITIAL
DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
COVERED SOFTWARE, OR ANY SUPPLIER
OF ANY OF SUCH PARTIES, BE
LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL,
OR
CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUD
ING, WITHOUT
LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
STOPPAGE,
COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
COMMERCIAL DAMAGES OR LOSSES, EVEN
IF SUCH PARTY SHALL HAVE BEEN
INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION
OF
LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
INJURY RESULTING FROM
SUCH PARTY'S NEGLIGENCE TO THE EXTENT
APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
JURISDICTIONS DO
NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
CONSEQUENTIAL
DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
APPLY TO YOU.
8. U.S. GOVERNMENT END
USERS.
The Covered Software is a "commercial item," as that term is
defined in 48
C.F.R. 2.101 (Oct. 1995), consisting of "commercial
computer software" (as that term is
defined at 48
C.F.R. 252.227-7014(a)(1)) and "commercial computer software
documentation"
as such terms are used in 48 C.F.R. 12.212
(Sept. 199
5). Consistent with 48 C.F.R. 12.212 and 48
C.F.R. 227.7202-1 through 227.7202-4 (June
1995), all
U.S. Government End Users acquire Covered Software with only those
rights
set forth herein. This U.S. Government Rights clause is in
lieu of, and supersedes, any
other FAR, DFAR, or other clause or
provision that addresses Government rights in computer
software
under this License.
9. MISCELLANEOUS.
This License represents the complete
agreement concerning subject
matter hereof. If any provision of this License is held
to be
unenforceable, such provision shall be reformed only to the extent
necessary
to make it enforceable. This License shall be governed
by the law of the jurisdiction
specified in a notice contained
within the Original Software (except to the extent applicable
law,
if any, provides otherwise), excluding such jurisdiction's
conflict-of-law provisions.
Any litigation relating to this
License shall b
e subject to the jurisdiction of the courts located
in the jurisdiction and venue specified
in a notice contained
within the Original Software, with the losing party responsible
for costs, including, without limitation, court costs and
reasonable attorneys' fees
and expenses. The application of the
United Nations Convention on Contracts for the International
Sale
of Goods is expressly excluded. Any law or regulation which
provides that the
language of a contract shall be construed
against the drafter shall not apply to this
License. You agree
that You alone are responsible for compliance with the United
States export administration regulations (and the export control
laws and regulation of
any other countries) when You use,
distribute or otherwise make available any Covered
Software.
10. RESPONSIBILITY FOR CLAIMS.
As between Initial Developer and the Contributors,
each party is
responsible for claims and damages ar
ising, directly or
indirectly, out of its utilization of rights under this License
and You agree to work with Initial Developer and Contributors to
distribute such responsibility
on an equitable basis. Nothing
herein is intended or shall be deemed to constitute any
admission
of liability.
\ No newline at end of file
Added: portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/SLF4J-LICENSE
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/SLF4J-LICENSE?rev=775992&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/SLF4J-LICENSE (added)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/META-INF/SLF4J-LICENSE Mon May 18 15:37:06
2009
@@ -0,0 +1,23 @@
+SLF4J logging libraries
+
+ Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Added: portals/pluto/trunk/pluto-testsuite/src/main/webapp/META-INF/SLF4J-LICENSE
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/webapp/META-INF/SLF4J-LICENSE?rev=775992&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/webapp/META-INF/SLF4J-LICENSE (added)
+++ portals/pluto/trunk/pluto-testsuite/src/main/webapp/META-INF/SLF4J-LICENSE Mon May 18
15:37:06 2009
@@ -0,0 +1,23 @@
+SLF4J logging libraries
+
+ Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Author: cziegeler
Date: Mon May 18 14:06:34 2009
New Revision: 775957
URL: http://svn.apache.org/viewvc?rev=775957&view=rev
Log:
Use Tomcat 6 again.
Modified:
portals/pluto/trunk/dist-build.xml
Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?rev=775957&r1=775956&r2=775957&view=diff
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Mon May 18 14:06:34 2009
@@ -44,8 +44,8 @@
-->
<project name="PlutoDistributions" default="bundle-dist">
- <property name="tomcat.major.version" value="5" description="Major version of Tomcat
to deploy Pluto war files."/>
- <property name="tomcat.full.version" value="5.5.27" description="Full version of Tomcat
to deploy Pluto war files."/>
+ <property name="tomcat.major.version" value="6" description="Major version of Tomcat
to deploy Pluto war files."/>
+ <property name="tomcat.full.version" value="6.0.18" description="Full version of Tomcat
to deploy Pluto war files."/>
<xmlproperty file="pom.xml"/> <!-- picks up pluto build version from pom file
-->
<property name="pluto.version" value="${project.version}" description="Version of
Pluto to build"/>
Author: ate
Date: Mon May 18 13:56:01 2009
New Revision: 775951
URL: http://svn.apache.org/viewvc?rev=775951&view=rev
Log:
Adding jcl-over-slf4j as commons-logging is still needed for libraries like commons-digester
Modified:
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775951&r1=775950&r2=775951&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 13:56:01 2009
@@ -65,6 +65,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<scope>compile</scope>
Author: cziegeler
Date: Mon May 18 13:52:53 2009
New Revision: 775949
URL: http://svn.apache.org/viewvc?rev=775949&view=rev
Log:
Minor update on the readme.
Modified:
portals/pluto/trunk/README
Modified: portals/pluto/trunk/README
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/README?rev=775949&r1=775948&r2=775949&view=diff
==============================================================================
--- portals/pluto/trunk/README (original)
+++ portals/pluto/trunk/README Mon May 18 13:52:53 2009
@@ -13,21 +13,19 @@
# See the License for the specific language governing permissions and
# limitations under the License
-Pluto 2.0 is the first version of the JSR-286 Reference Implementation (Java Portlet API
2.0). This
-version was based on Pluto 1.1 and was refactored in the 1.1-286-COMPATIBILITY branch to
add
-JSR-286 features and create the official JSR-286 RI submitted to the Java Community Process.
-
-The Pluto 2.0 code was subsequently refactored within the 2.0-spi-refactoring branch to make
the descriptor
-API more flexible and fix other issues. This branch became the new trunk on 11/3/2008.
-
-See the Getting Started page on the Pluto web site (http://portals.apache.org/pluto/v11/getting-started.html)
-for instructions on how to build Pluto from source. Currently there is no binary or bundled
-distribution of Pluto 2.0.
+Apach Pluto 2.0 is the first version of the JSR-286 Reference Implementation (Java Portlet
API 2.0).
+See the Getting Started page on the Pluto web site (http://portals.apache.org/pluto)
+for instructions on how to build Pluto from source.
A simplified way to build a bundled Pluto 2.0 distribution is to use the dist-build.xml Ant
build which downloads
-Tomcat and calls the appropriate maven commands to create a distribution with Pluto embedded
in Tomcat. The
+Tomcat and calls the appropriate Maven commands to create a distribution with Pluto embedded
in Tomcat. The
built distribution, which contains this file, when started via the startup script in the
bin directory will
start the Pluto portal by browsing to http://localhost:8080/pluto/portal/ and logging in
as pluto/pluto
(or tomcat/tomcat). See the documentation in dist-build.xml for more details. Also invoke
the Help mode on the
Pluto Admin page for instructions on how to use the admin portlet to deploy custom portlets.
+This version was based on Pluto 1.1 and was refactored in the 1.1-286-COMPATIBILITY branch
to add
+JSR-286 features and create the official JSR-286 RI submitted to the Java Community Process.
+
+The Pluto 2.0 code was subsequently refactored within the 2.0-spi-refactoring branch to make
the descriptor
+API more flexible and fix other issues. This branch became the new trunk on 11/3/2008.
Author: cziegeler
Date: Mon May 18 13:46:45 2009
New Revision: 775947
URL: http://svn.apache.org/viewvc?rev=775947&view=rev
Log:
Don't generate source or javadoc for web apps.
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775947&r1=775946&r2=775947&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 13:46:45 2009
@@ -156,6 +156,19 @@
</execution>
</executions>
</plugin>
+ <!-- Don't attach source or javadoc archive -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775947&r1=775946&r2=775947&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 13:46:45 2009
@@ -122,6 +122,19 @@
</execution>
</executions>
</plugin>
+ <!-- Don't attach source or javadoc archive -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Author: cziegeler
Date: Mon May 18 13:21:46 2009
New Revision: 775940
URL: http://svn.apache.org/viewvc?rev=775940&view=rev
Log:
Use older Tomcat version.
Modified:
portals/pluto/trunk/dist-build.xml
Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?rev=775940&r1=775939&r2=775940&view=diff
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Mon May 18 13:21:46 2009
@@ -44,8 +44,8 @@
-->
<project name="PlutoDistributions" default="bundle-dist">
- <property name="tomcat.major.version" value="6" description="Major version of Tomcat
to deploy Pluto war files."/>
- <property name="tomcat.full.version" value="6.0.18" description="Full version of Tomcat
to deploy Pluto war files."/>
+ <property name="tomcat.major.version" value="5" description="Major version of Tomcat
to deploy Pluto war files."/>
+ <property name="tomcat.full.version" value="5.5.27" description="Full version of Tomcat
to deploy Pluto war files."/>
<xmlproperty file="pom.xml"/> <!-- picks up pluto build version from pom file
-->
<property name="pluto.version" value="${project.version}" description="Version of
Pluto to build"/>
Author: cziegeler
Date: Mon May 18 12:08:49 2009
New Revision: 775913
URL: http://svn.apache.org/viewvc?rev=775913&view=rev
Log:
Move legal files into meta-inf to avoid overwriting the ianal plugin config.
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775913&r1=775912&r2=775913&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 12:08:49 2009
@@ -140,18 +140,18 @@
</webResources>
</configuration>
</plugin>
+ <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE
and LICENSE file to be put under WEB-INF/classes/META-INF -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>verify-legal-files</goal>
+ <goal>process</goal>
</goals>
<configuration>
- <searchPaths>
- <searchPath>WEB-INF/classes/META-INF</searchPath>
- </searchPaths>
+ <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <attached>false</attached>
</configuration>
</execution>
</executions>
Author: cziegeler
Date: Mon May 18 11:48:18 2009
New Revision: 775906
URL: http://svn.apache.org/viewvc?rev=775906&view=rev
Log:
Add missing licence headers and remove web dtd from rat check.
Modified:
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/portlet.xml
portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/web.xml
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=775906&r1=775905&r2=775906&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Mon May 18 11:48:18 2009
@@ -68,7 +68,21 @@
</dependency>
</dependencies>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/org/apache/pluto/util/descriptors/web/web-app_2_3.dtd</exclude>
+ <exclude>src/test/resources/org/apache/pluto/util/assemble/web-app_2_3.dtd</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<!-- Don't create distribution artifacts -->
<profiles>
<profile>
Modified: portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml?rev=775906&r1=775905&r2=775906&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
(original)
+++ portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
Mon May 18 11:48:18 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<display-name>WarTestServletDisplayName</display-name>
<servlet>
Modified: portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/portlet.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/portlet.xml?rev=775906&r1=775905&r2=775906&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/portlet.xml
(original)
+++ portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/portlet.xml
Mon May 18 11:48:18 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
Modified: portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/web.xml?rev=775906&r1=775905&r2=775906&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/web.xml
(original)
+++ portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/web.xml
Mon May 18 11:48:18 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<display-name>WarTestServletDisplayName</display-name>
</web-app>
Author: cziegeler
Date: Mon May 18 11:42:49 2009
New Revision: 775905
URL: http://svn.apache.org/viewvc?rev=775905&view=rev
Log:
Correct portlet xsd licence header and remove xsds and dtds from rats check.
Modified:
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=775905&r1=775904&r2=775905&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Mon May 18 11:42:49 2009
@@ -136,6 +136,17 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd</exclude>
+ <exclude>src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd</exclude>
+ <exclude>src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd?rev=775905&r1=775904&r2=775905&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd
(original)
+++ portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd
Mon May 18 11:42:49 2009
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
<schema targetNamespace="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:portlet="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" xml:lang="en">
<annotation>
<documentation>
Author: ate
Date: Mon May 18 11:39:38 2009
New Revision: 775904
URL: http://svn.apache.org/viewvc?rev=775904&view=rev
Log:
Restoring maven-war-plugin and maven-pluto-plugin configuration
Also adding maven-remote-resources-plugin "fix" to for war files so legal files end up in
the right location (META-INF/ instead of WEB-INF/classes/META-INF/).
Because of the m-r-r-plugin fix the ianal-maven-plugin override isn't needed anymore either
Modified:
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775904&r1=775903&r2=775904&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 11:39:38 2009
@@ -85,18 +85,39 @@
</resource>
</resources>
<plugins>
+ <!-- configure maven-war-plugin to use updated web.xml -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
+ <plugin>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <version>${pom.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE
and LICENSE file to be put under WEB-INF/classes/META-INF -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>verify-legal-files</goal>
+ <goal>process</goal>
</goals>
<configuration>
- <searchPaths>
- <searchPath>WEB-INF/classes/META-INF</searchPath>
- </searchPaths>
+ <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <attached>false</attached>
</configuration>
</execution>
</executions>
Author: cziegeler
Date: Mon May 18 09:22:38 2009
New Revision: 775870
URL: http://svn.apache.org/viewvc?rev=775870&view=rev
Log:
Use jcl-over-slf4j instead of directly including jcl.
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775870&r1=775869&r2=775870&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 09:22:38 2009
@@ -109,9 +109,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=775870&r1=775869&r2=775870&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Mon May 18 09:22:38 2009
@@ -286,6 +286,11 @@
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
<!-- Specification Libraries =========================================== -->
<dependency>
Author: cziegeler
Date: Mon May 18 08:46:11 2009
New Revision: 775862
URL: http://svn.apache.org/viewvc?rev=775862&view=rev
Log:
Remove obsolete assembly stuff and try to get dist build running.
Removed:
portals/pluto/trunk/assembly/
Author: cziegeler
Date: Mon May 18 08:45:15 2009
New Revision: 775861
URL: http://svn.apache.org/viewvc?rev=775861&view=rev
Log:
Remove obsolete assembly stuff and try to get dist build running.
Modified:
portals/pluto/trunk/dist-build.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?rev=775861&r1=775860&r2=775861&view=diff
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Mon May 18 08:45:15 2009
@@ -58,56 +58,6 @@
<property name="unzip.file" value="${dist.basedir}/${base.name}.tar.gz"/>
<property name="tar.file" value="${dist.basedir}/${base.name}.tar"/>
- <fileset dir="." id="src.fileset">
- <include name="**/*"/>
- <exclude name="**/*.class"/>
- <exclude name="**/*.zip"/>
- <exclude name="**/*.tar.gz"/>
- <exclude name="**/*.tar.b2"/>
- <exclude name="**/target/**/*"/>
- <exclude name="**/.svn/*"/>
- <exclude name="bin/**/*"/>
- <exclude name=".classpath"/>
- <exclude name=".project"/>
- </fileset>
-
- <target name="src-dist" depends="prepare-src-dist">
- <zip destfile="${dist.basedir}/${pluto.name}-src.zip">
- <zipfileset refid="src.fileset"/>
- </zip>
-
- <antcall target="srctar-nocompress"/>
-
- <gzip src="${dist.basedir}/${pluto.name}-src.tar"
- destfile="${dist.basedir}/${pluto.name}-src.tar.gz"/>
-
- <bzip2 src="${dist.basedir}/${pluto.name}-src.tar"
- destfile="${dist.basedir}/${pluto.name}-src.tar.bz2"/>
-
- <antcall target="clean"/>
- </target>
-
- <target name="srctar-nocompress" description="Creates tar source distributions">
- <tar destfile="${dist.basedir}/${pluto.name}-src.tar">
- <tarfileset dir="."> <!-- refid does not work -->
- <include name="**/*"/>
- <exclude name="**/*.class"/>
- <exclude name="**/*.zip"/>
- <exclude name="**/*.tar.gz"/>
- <exclude name="**/*.tar.bz2"/>
- <exclude name="**/target/**/*"/>
- <exclude name="**/.svn/*"/>
- <exclude name="bin/**/*"/>
- <exclude name=".classpath"/>
- <exclude name=".project"/>
- </tarfileset>
- </tar>
- </target>
-
- <target name="prepare-src-dist">
- <mkdir dir="${dist.basedir}"/>
- </target>
-
<target name="bundle-dist" depends="prepare-bundle-dist,run-maven" description="Creates
zip, gzip, and bzip2 distributions">
<!-- Copy over jars needed to deploy custom portlets -->
<copy file="pluto-util/target/pluto-util-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>
@@ -183,7 +133,7 @@
<arg line="install"/>
</exec>
<exec executable="mvn" vmlauncher="false" dir="${basedir}" failonerror="true">
- <arg line="org.apache.portals.pluto:maven-pluto-plugin:${pluto.version}:install -DinstallDir=${user.dir}/${dist.dir}"/>
+ <arg line="org.apache.portals.pluto:maven-pluto-plugin:${pluto.version}:install -DinstallDir=${basedir}/${dist.dir}"/>
</exec>
</target>
@@ -191,8 +141,6 @@
<delete dir="${dist.dir}"/>
<delete file="${unzip.file}"/>
<delete file="${tar.file}"/>
- <delete file="${dist.basedir}/${pluto.name}-src.tar"/>
- <delete file="${dist.basedir}/${pluto.name}-bin.tar"/>
</target>
</project>
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=775861&r1=775860&r2=775861&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Mon May 18 08:45:15 2009
@@ -491,32 +491,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>assembly</id>
- <modules>
- <module>assembly</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<!-- Pluto Modules ======================================================= -->
<modules>
Author: cziegeler
Date: Mon May 18 07:34:06 2009
New Revision: 775846
URL: http://svn.apache.org/viewvc?rev=775846&view=rev
Log:
Add missing commons logging (Spring requires commons logging)
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775846&r1=775845&r2=775846&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 07:34:06 2009
@@ -108,6 +108,11 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<artifactId>junit</artifactId>
Author: cziegeler
Date: Mon May 18 07:00:16 2009
New Revision: 775842
URL: http://svn.apache.org/viewvc?rev=775842&view=rev
Log:
Fix ianal configuration, add missing headers.
Modified:
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775842&r1=775841&r2=775842&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 07:00:16 2009
@@ -85,13 +85,21 @@
</resource>
</resources>
<plugins>
- <!-- configure maven-war-plugin to use updated web.xml -->
<plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
- <configuration>
- <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <searchPaths>
+ <searchPath>WEB-INF/classes/META-INF</searchPath>
+ </searchPaths>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: portals/pluto/trunk/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp?rev=775842&r1=775841&r2=775842&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp Mon May
18 07:00:16 2009
@@ -1,3 +1,21 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
<%@taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0" %>
<%@taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<portlet:defineObjects />
Author: cziegeler
Date: Mon May 18 06:58:09 2009
New Revision: 775841
URL: http://svn.apache.org/viewvc?rev=775841&view=rev
Log:
Fix ianal configuration, add missing headers.
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775841&r1=775840&r2=775841&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 06:58:09 2009
@@ -136,6 +136,22 @@
</webResources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <searchPaths>
+ <searchPath>WEB-INF/classes/META-INF</searchPath>
+ </searchPaths>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties?rev=775841&r1=775840&r2=775841&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties
(original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties
Mon May 18 06:58:09 2009
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
\ No newline at end of file
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template?rev=775841&r1=775840&r2=775841&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template
(original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template
Mon May 18 06:58:09 2009
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
\ No newline at end of file
Author: cziegeler
Date: Mon May 18 06:38:29 2009
New Revision: 775830
URL: http://svn.apache.org/viewvc?rev=775830&view=rev
Log:
Remove obsolete assemblies and further clean up of poms
Removed:
portals/pluto/trunk/pluto-portal/src/assemble/
portals/pluto/trunk/pluto-testsuite/src/assemble/
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775830&r1=775829&r2=775830&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 06:38:29 2009
@@ -124,67 +124,19 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1-beta-1</version>
<configuration>
- <webResources>
- <resource>
- <filtering>true</filtering>
- <directory>${pom.basedir}/src/main/resources</directory>
- <includes>
- <include>pluto-portal-driver-config.xml</include>
- </includes>
- <targetPath>WEB-INF</targetPath>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <tasks>
- <get src="http://archive.apache.org/dist/tomcat/tomcat-5/archive/v5.5.9/bin/jakarta-tomcat-5.5.9.tar.gz"
dest="target/tomcat.tar.gz" />
- <gunzip src="target/tomcat.tar.gz" />
- <untar src="target/tomcat.tar" />
- </tasks>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
- <!-- TODO fix skip -->
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>pluto-portal-${pom.version}</finalName>
- </configuration>
- <executions>
- <execution>
- <id>make-project-assembly-source-release</id>
- <inherited>false</inherited>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+ <webResources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <includes>
+ <include>pluto-portal-driver-config.xml</include>
+ </includes>
+ <targetPath>WEB-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
-
</build>
<!-- Don't create distribution artifacts -->
@@ -205,5 +157,3 @@
</profile>
</profiles>
</project>
-
-
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775830&r1=775829&r2=775830&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 06:38:29 2009
@@ -75,131 +75,103 @@
</dependency>
</dependencies>
- <!-- Build configuration -->
- <build>
- <finalName>pluto-testsuite</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
- <!-- TODO fix skip -->
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- configure maven-war-plugin to use updated web.xml -->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
- </configuration>
- </plugin>
- <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
- <plugin>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>deploy-testsuite</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property><name>deploy.dir</name></property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <configuration>
- <tasks>
- <!--
- Use this to build and deploy the testsuite war.
- PORTLET_DEPLOY_DIR is an environmental variable
- pointing to the hot-deploy directory of your portal.
- You can also use -Ddeploy.dir=<path to deployment dir>
- on the command line when invoking maven:
- mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
- -->
- <property environment="env"/>
- <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
- <copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>deploy-testsuite-by-env</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property><name>env.PORTLET_DEPLOY_DIR</name></property>
- </activation>
- <build>
+ <!-- Build configuration -->
+ <build>
+ <finalName>pluto-testsuite</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>integration-test</phase>
+ <!-- configure maven-war-plugin to use updated web.xml -->
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
<configuration>
- <tasks>
- <!--
- Use this to build and deploy the testsuite war.
- PORTLET_DEPLOY_DIR is an environmental variable
- pointing to the hot-deploy directory of your portal.
- You can also use -Ddeploy.dir=<path to deployment dir>
- on the command line when invoking maven:
- mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
- -->
- <property environment="env"/>
- <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
- <copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war"/>
- </tasks>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ </plugin>
</plugins>
- </build>
- </profile>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>deploy-testsuite</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property><name>deploy.dir</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <configuration>
+ <tasks>
+ <!--
+ Use this to build and deploy the testsuite war.
+ PORTLET_DEPLOY_DIR is an environmental variable
+ pointing to the hot-deploy directory of your portal.
+ You can also use -Ddeploy.dir=<path to deployment
dir>
+ on the command line when invoking maven:
+ mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
+ -->
+ <property environment="env"/>
+ <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
+ <copy file="target/${pom.build.finalName}.war"
tofile="${deploy.dir}/testsuite.war"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>deploy-testsuite-by-env</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property><name>env.PORTLET_DEPLOY_DIR</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <configuration>
+ <tasks>
+ <!--
+ Use this to build and deploy the testsuite war.
+ PORTLET_DEPLOY_DIR is an environmental variable
+ pointing to the hot-deploy directory of your portal.
+ You can also use -Ddeploy.dir=<path to deployment
dir>
+ on the command line when invoking maven:
+ mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
+ -->
+ <property environment="env"/>
+ <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
+ <copy file="target/${pom.build.finalName}.war"
tofile="${deploy.dir}/testsuite.war"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!-- Don't create distribution artifacts -->
<profile>
<id>apache-release</id>
@@ -215,8 +187,5 @@
</plugins>
</build>
</profile>
- </profiles>
-
+ </profiles>
</project>
-
-
Author: cziegeler
Date: Mon May 18 06:25:16 2009
New Revision: 775828
URL: http://svn.apache.org/viewvc?rev=775828&view=rev
Log:
Remove obsolete assemblies and further clean up of poms
Removed:
portals/pluto/trunk/pluto-container/src/assemble/
portals/pluto/trunk/pluto-portal-driver/src/assemble/
portals/pluto/trunk/pluto-taglib/src/site/
Modified:
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=775828&r1=775827&r2=775828&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Mon May 18 06:25:16 2009
@@ -29,7 +29,6 @@
</parent>
<artifactId>pluto-portal-driver-impl</artifactId>
- <packaging>jar</packaging>
<name>Apache Pluto Portal Driver Implementation Classes</name>
<dependencies>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=775828&r1=775827&r2=775828&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Mon May 18 06:25:16 2009
@@ -29,7 +29,6 @@
</parent>
<artifactId>pluto-portal-driver</artifactId>
- <packaging>jar</packaging>
<name>Apache Pluto Portal Driver</name>
<dependencies>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=775828&r1=775827&r2=775828&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Mon May 18 06:25:16 2009
@@ -29,7 +29,6 @@
</parent>
<artifactId>pluto-taglib</artifactId>
- <packaging>jar</packaging>
<name>Apache Pluto Portlet Tag Library</name>
<description>Apache Pluto's Java Portlet Specification Tag Library implementation</description>
Author: cziegeler
Date: Mon May 18 06:19:59 2009
New Revision: 775827
URL: http://svn.apache.org/viewvc?rev=775827&view=rev
Log:
Fix pom for ant tasks and remove obsolete assembly config.
Removed:
portals/pluto/trunk/pluto-ant-tasks/src/assemble/
Modified:
portals/pluto/trunk/pluto-ant-tasks/pom.xml
Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=775827&r1=775826&r2=775827&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Mon May 18 06:19:59 2009
@@ -44,41 +44,25 @@
<artifactId>ant</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
- <build>
- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <plugins>
- <!-- todo remove -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
- <!-- TODO fix skip -->
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Author: cziegeler
Date: Sun May 17 15:53:09 2009
New Revision: 775679
URL: http://svn.apache.org/viewvc?rev=775679&view=rev
Log:
Some pom formatting and correct reference to parent pom.
Modified:
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=775679&r1=775678&r2=775679&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Sun May 17 15:53:09 2009
@@ -32,65 +32,64 @@
<packaging>maven-plugin</packaging>
<name>Maven Pluto Installer Plugin</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-util</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
-
- <!-- Do not remove this dep: See MNG-1178 -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-util</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+
+ <!-- Do not remove this dep: See MNG-1178 -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
- <build>
- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/scripts</directory>
- <includes>
- <include>**/*.mmld</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>pluto2</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/scripts</directory>
+ <includes>
+ <include>**/*.mmld</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>pluto2</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<!-- Don't create distribution artifacts -->
<profiles>
@@ -110,6 +109,3 @@
</profile>
</profiles>
</project>
-
-
-
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=775679&r1=775678&r2=775679&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Sun May 17 15:53:09 2009
@@ -31,10 +31,8 @@
<artifactId>pluto-container</artifactId>
<name>Apache Pluto Portlet Container</name>
<description>The Apache Pluto portlet container.</description>
-
-
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
@@ -112,32 +110,32 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
</resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
- <plugins>
+ <plugins>
<!-- Surefire Plugin: Exec Tests ===================================== -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/PlutoTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/PlutoTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=775679&r1=775678&r2=775679&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Sun May 17 15:53:09 2009
@@ -154,7 +154,4 @@
</build>
</profile>
</profiles>
-</project>
-
-
-
+</project>
\ No newline at end of file
Author: cziegeler
Date: Sun May 17 15:46:11 2009
New Revision: 775678
URL: http://svn.apache.org/viewvc?rev=775678&view=rev
Log:
Some pom formatting and correct reference to parent pom.
Modified:
portals/pluto/trunk/assembly/pom.xml
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/pluto-ant-tasks/pom.xml
portals/pluto/trunk/pluto-container-api/pom.xml
portals/pluto/trunk/pluto-container-driver-api/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/assembly/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/assembly/pom.xml (original)
+++ portals/pluto/trunk/assembly/pom.xml Sun May 17 15:46:11 2009
@@ -18,14 +18,13 @@
-->
<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>
- <artifactId>pluto</artifactId>
- <groupId>org.apache.portals.pluto</groupId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>pluto</artifactId>
+ <groupId>org.apache.portals.pluto</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>assembly</artifactId>
<name>Apache Pluto Assembly Project</name>
<url>http://portals.apache.org/pluto/</url>
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Sun May 17 15:46:11 2009
@@ -21,17 +21,17 @@
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.apache.portals.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>maven-pluto-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Maven Pluto Installer Plugin</name>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>Maven Pluto Installer Plugin</name>
+
<dependencies>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Sun May 17 15:46:11 2009
@@ -21,35 +21,34 @@
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.apache.portals.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>pluto-ant-tasks</artifactId>
- <packaging>jar</packaging>
- <name>Apache Pluto Ant Tasks</name>
- <description>The Pluto Ant Tasks are used to assemble, deploy, and publish portlets
to the Pluto Portal Driver.</description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-util</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
+ <artifactId>pluto-ant-tasks</artifactId>
+ <name>Apache Pluto Ant Tasks</name>
+ <description>The Pluto Ant Tasks are used to assemble, deploy, and publish portlets
to the Pluto Portal Driver.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-util</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
<build>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
Modified: portals/pluto/trunk/pluto-container-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-api/pom.xml Sun May 17 15:46:11 2009
@@ -21,16 +21,14 @@
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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>pluto-container-api</artifactId>
- <packaging>jar</packaging>
<name>Apache Pluto Container API</name>
<dependencies>
Modified: portals/pluto/trunk/pluto-container-driver-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-driver-api/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-driver-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-driver-api/pom.xml Sun May 17 15:46:11 2009
@@ -21,14 +21,13 @@
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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>pluto-container-driver-api</artifactId>
<packaging>jar</packaging>
<name>Apache Pluto Container Driver API</name>
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Sun May 17 15:46:11 2009
@@ -21,16 +21,14 @@
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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>pluto-container</artifactId>
- <packaging>jar</packaging>
<name>Apache Pluto Portlet Container</name>
<description>The Apache Pluto portlet container.</description>
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Sun May 17 15:46:11 2009
@@ -21,13 +21,13 @@
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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>pluto-portal-driver-impl</artifactId>
<packaging>jar</packaging>
<name>Apache Pluto Portal Driver Implementation Classes</name>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Sun May 17 15:46:11 2009
@@ -21,13 +21,13 @@
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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>pluto-portal-driver</artifactId>
<packaging>jar</packaging>
<name>Apache Pluto Portal Driver</name>
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Sun May 17 15:46:11 2009
@@ -21,115 +21,100 @@
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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>pluto-portal</artifactId>
<packaging>war</packaging>
<name>Apache Pluto Portal</name>
- <dependencies>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container</artifactId>
- <version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.portals</groupId>
- <artifactId>portlet-api_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-portal-driver</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-portal-driver-impl</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </dependency>
-
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-portal-driver</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-portal-driver-impl</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </dependency>
+ </dependencies>
<build>
<finalName>pluto-portal</finalName>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Sun May 17 15:46:11 2009
@@ -21,13 +21,13 @@
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>
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>pluto-taglib</artifactId>
<packaging>jar</packaging>
<name>Apache Pluto Portlet Tag Library</name>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775678&r1=775677&r2=775678&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Sun May 17 15:46:11 2009
@@ -21,65 +21,59 @@
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.apache.portals.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>pluto-testsuite</artifactId>
- <packaging>war</packaging>
- <name>Apache Pluto Testsuite Portlet</name>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>pluto-testsuite</artifactId>
+ <packaging>war</packaging>
+ <name>Apache Pluto Testsuite Portlet</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.portals</groupId>
- <artifactId>portlet-api_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
+ <artifactId>jstl</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
<!-- Build configuration -->
<build>
@@ -128,16 +122,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <!-- best lock down version of the plugin too -->
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
Author: cziegeler
Date: Sun May 17 15:36:20 2009
New Revision: 775676
URL: http://svn.apache.org/viewvc?rev=775676&view=rev
Log:
Remove obsolete resources and format pom.
Removed:
portals/pluto/trunk/pluto-util/src/resources/
Modified:
portals/pluto/trunk/pluto-util/pom.xml
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=775676&r1=775675&r2=775676&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Sun May 17 15:36:20 2009
@@ -18,66 +18,57 @@
-->
<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>
- <artifactId>pluto</artifactId>
- <groupId>org.apache.portals.pluto</groupId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>pluto-util</artifactId>
- <name>Apache Pluto Utilities</name>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>pluto</artifactId>
+ <groupId>org.apache.portals.pluto</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>pluto-util</artifactId>
+ <name>Apache Pluto Utilities</name>
- <!-- The dependencies for the ApplicationServerHook project
- are those which need to be installed!
- -->
- <dependencies>
+ <!-- The dependencies for the ApplicationServerHook project
+ are those which need to be installed!
+ -->
+ <dependencies>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container-api</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
+
+ </dependencies>
- </dependencies>
<!-- Don't create distribution artifacts -->
<profiles>
<profile>
Author: cziegeler
Date: Sun May 17 15:32:02 2009
New Revision: 775675
URL: http://svn.apache.org/viewvc?rev=775675&view=rev
Log:
Remove site and site skin as the docs are now in the site module. Start cleaning up poms for
the release.
Removed:
portals/pluto/trunk/maven-pluto-plugin/src/site/
portals/pluto/trunk/pluto-ant-tasks/src/site/
portals/pluto/trunk/pluto-container-api/src/site/
portals/pluto/trunk/pluto-container/src/site/
portals/pluto/trunk/pluto-portal-driver-impl/src/site/
portals/pluto/trunk/pluto-portal-driver/src/site/
portals/pluto/trunk/pluto-portal/src/site/
portals/pluto/trunk/pluto-testsuite/src/site/
portals/pluto/trunk/pluto-util/src/site/
Author: cziegeler
Date: Sun May 17 15:29:49 2009
New Revision: 775674
URL: http://svn.apache.org/viewvc?rev=775674&view=rev
Log:
Remove site and site skin as the docs are now in the site module. Start cleaning up poms for
the release.
Removed:
portals/pluto/trunk/pluto-site/
portals/pluto/trunk/pluto-site-skin/
portals/pluto/trunk/src/
Modified:
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/pluto-ant-tasks/pom.xml
portals/pluto/trunk/pluto-container-api/pom.xml
portals/pluto/trunk/pluto-container-driver-api/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Sun May 17 15:29:49 2009
@@ -89,13 +89,26 @@
<goalPrefix>pluto2</goalPrefix>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
</plugins>
</build>
-
+
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Sun May 17 15:29:49 2009
@@ -72,12 +72,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>src/assemble/bin.xml</descriptor>
Modified: portals/pluto/trunk/pluto-container-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-api/pom.xml Sun May 17 15:29:49 2009
@@ -55,12 +55,21 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-container-driver-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-driver-api/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-driver-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-driver-api/pom.xml Sun May 17 15:29:49 2009
@@ -61,12 +61,21 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Sun May 17 15:29:49 2009
@@ -140,13 +140,24 @@
</excludes>
</configuration>
</plugin>
- <!--plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin-->
</plugins>
</build>
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Sun May 17 15:29:49 2009
@@ -137,20 +137,23 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <!-- best lock down version of the plugin too -->
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Sun May 17 15:29:49 2009
@@ -151,17 +151,6 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <!-- best lock down version of the plugin too -->
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -170,6 +159,23 @@
</resources>
</build>
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Sun May 17 15:29:49 2009
@@ -134,35 +134,34 @@
<build>
<finalName>pluto-portal</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <filtering>true</filtering>
- <directory>${pom.basedir}/src/main/resources</directory>
- <includes>
- <include>pluto-portal-driver-config.xml</include>
- </includes>
- <!-- <targetPath> requires version 2.0.2 of maven-war-plugin -->
- <targetPath>WEB-INF</targetPath>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <tasks>
- <get src="http://archive.apache.org/dist/tomcat/tomcat-5/archive/v5.5.9/bin/jakarta-tomcat-5.5.9.tar.gz"
dest="target/tomcat.tar.gz" />
- <gunzip src="target/tomcat.tar.gz" />
- <untar src="target/tomcat.tar" />
- </tasks>
- </configuration>
- </plugin>
-
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <includes>
+ <include>pluto-portal-driver-config.xml</include>
+ </includes>
+ <targetPath>WEB-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <tasks>
+ <get src="http://archive.apache.org/dist/tomcat/tomcat-5/archive/v5.5.9/bin/jakarta-tomcat-5.5.9.tar.gz"
dest="target/tomcat.tar.gz" />
+ <gunzip src="target/tomcat.tar.gz" />
+ <untar src="target/tomcat.tar" />
+ </tasks>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
@@ -199,15 +198,27 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
-
- </plugins>
+ </plugins>
</build>
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Sun May 17 15:29:49 2009
@@ -56,17 +56,21 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Sun May 17 15:29:49 2009
@@ -216,7 +216,22 @@
</plugins>
</build>
</profile>
- </profiles>
+ <!-- Don't create distribution artifacts -->
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Sun May 17 15:29:49 2009
@@ -78,18 +78,21 @@
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
+ <!-- Don't create distribution artifacts -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=775674&r1=775673&r2=775674&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Sun May 17 15:29:49 2009
@@ -218,26 +218,12 @@
</contributor>
</contributors>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/portals/pluto/trunk</url>
</scm>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
-
<!-- Dependency Version Properties ======================================= -->
<!--
@@ -552,9 +538,5 @@
<module>pluto-util</module>
<module>maven-pluto-plugin</module>
<module>pluto-ant-tasks</module>
-
- <!-- Pluto Documentations -->
- <!--module>pluto-site</module-->
- <module>pluto-site-skin</module>
</modules>
</project>
Author: cziegeler
Date: Fri May 15 07:43:36 2009
New Revision: 775052
URL: http://svn.apache.org/viewvc?rev=775052&view=rev
Log:
Remove stuff that is already inherited from parent apache parent pom.
Modified:
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=775052&r1=775051&r2=775052&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Fri May 15 07:43:36 2009
@@ -487,43 +487,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-5</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <supplementalModels>
- <supplementalModel>
- ${project.basedir}/../pluto-site/src/main/appended-resources/supplemental-models.xml
- </supplementalModel>
- </supplementalModels>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
@@ -531,67 +494,17 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
-
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-5</version>
- </extension>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ftp</artifactId>
- <version>1.0-alpha-6</version>
- </extension>
- </extensions>
-
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>assembly</id>
Author: cziegeler
Date: Fri May 15 07:30:22 2009
New Revision: 775044
URL: http://svn.apache.org/viewvc?rev=775044&view=rev
Log:
PLUTO-546 : Remove separate parent pom again, root pom is also the parent pom
Modified:
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=775044&r1=775043&r2=775044&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Fri May 15 07:30:22 2009
@@ -621,8 +621,6 @@
<!-- Pluto Modules ======================================================= -->
<modules>
- <!-- Parent -->
- <module>parent</module>
<!-- Pluto Container API -->
<module>pluto-container-api</module>
Author: cziegeler
Date: Fri May 15 07:29:19 2009
New Revision: 775043
URL: http://svn.apache.org/viewvc?rev=775043&view=rev
Log:
PLUTO-546 : Remove separate parent pom again, root pom is also the parent pom
Removed:
portals/pluto/trunk/parent/
Modified:
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=775043&r1=775042&r2=775043&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Fri May 15 07:29:19 2009
@@ -20,27 +20,604 @@
<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.apache</groupId>
- <artifactId>apache</artifactId>
- <version>3</version>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portals-pom</artifactId>
+ <version>1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.portals.pluto</groupId>
- <artifactId>reactor</artifactId>
+ <artifactId>pluto</artifactId>
<packaging>pom</packaging>
- <name>Apache Pluto - Reactor Build</name>
- <version>1-SNAPSHOT</version>
+ <name>Apache Pluto</name>
+ <!--
+ Any version changes need to be changed in:
+ 1. All poms of children modules
+ 2. pluto.container.version.minor property in environment.properties in
+ pluto-container module (src/main/resources/org/apache/pluto).
+ 3. portal-version element in pluto-portal-driver-config.xml in pluto-portal module
+ (src/main/webapp/WEB-INF)
+ 4. expected.serverInfo and expected.portalInfo properties in expectedResults.properties
+ in testsuite module (src/main/webapp/WEB-INF/classes)
+ 5. pluto.version in Ant build file dist-build.xml.
+ -->
+ <version>2.0.0-SNAPSHOT</version>
<!-- Due to a bug in maven 2.0, the description must not contain any line breaks or
tabs. -->
<description>Apache Pluto is the Reference Implementation of the Java Portlet Specification.</description>
<url>http://portals.apache.org/pluto</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10560</url>
+ </issueManagement>
+ <inceptionYear>2003</inceptionYear>
+
+
+ <!-- Mailing Lists ======================================================= -->
+
+ <mailingLists>
+ <mailingList>
+ <name>Pluto User List</name>
+ <subscribe>pluto-user-subscribe@portals.apache.org</subscribe>
+ <unsubscribe>pluto-user-unsubscribe@portals.apache.org</unsubscribe>
+ <post>pluto-user@portals.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/portals-pluto-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Pluto Developer List</name>
+ <subscribe>pluto-dev-subscribe@portals.apache.org</subscribe>
+ <unsubscribe>pluto-dev-unsubscribe@portals.apache.org</unsubscribe>
+ <post>pluto-dev@portals.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/portals-pluto-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Pluto SCM List</name>
+ <subscribe>pluto-scm-subscribe@portals.apache.org</subscribe>
+ <unsubscribe>pluto-scm-unsubscribe@portals.apache.org</unsubscribe>
+ <post>pluto-scm@portals.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/portals-pluto-scm</archive>
+ </mailingList>
+ </mailingLists>
+
+
+ <!-- Pluto Committers ==================================================== -->
+
+ <!-- Email format: [name]#a@T#[domain].d0t.[extension]
+ '@' and '.' characters are added because m2 seems to need them to
+ generate mailto links. -->
+
+ <developers>
+
+ <developer>
+ <name>Michael Blum</name>
+ <id>blumm</id>
+ <email>blumm#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Carsten Ziegeler</name>
+ <id>cziegeler</id>
+ <email>cziegeler#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>David DeWolf</name>
+ <id>ddewolf</id>
+ <email>ddewolf@apache.org</email>
+ <timezone>-4</timezone>
+ <url>http://www.daviddewolf.com</url>
+ <organization>Three Pillar Software, Inc.</organization>
+ <organizationUrl>http://www.threepillarsoftware.com</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Nick Lothian</name>
+ <id>nlothian</id>
+ <email>nlothian#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Craig Doremus</name>
+ <id>cdoremus</id>
+ <email>cdoremus#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Zhong Zheng</name>
+ <id>zheng</id>
+ <email>zheng#a@T#apache.d0t.org</email>
+ <timezone>+1</timezone>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Santiago Gala</name>
+ <id>sgala</id>
+ <email>sgala#a@T#hisitech.d0t.com</email>
+ <organization />
+ </developer>
+
+ <developer>
+ <name>Raphael Luta</name>
+ <id>raphael</id>
+ <email>raphael#a@T#apache.d0t.org</email>
+ <organization />
+ </developer>
+
+ <developer>
+ <name>David S. Taylor</name>
+ <id>taylor</id>
+ <email>david#a@T#bluesunrise.d0t.com</email>
+ <organization />
+ </developer>
+
+ <developer>
+ <name>Scott T. Weaver</name>
+ <id>weaver</id>
+ <email>weaver#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Stefan Hepper</name>
+ <id>sthepper</id>
+ <email>sthepper#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Elliot Metsger</name>
+ <id>esm</id>
+ <email>esm#a@T#apache.d0t.org</email>
+ <timezone>-4</timezone>
+ <url>http://uppertank.net/blog</url>
+ <organization>Johns Hopkins University, Sheridan Libraries</organization>
+ <organizationUrl>http://www.library.jhu.edu</organizationUrl>
+ </developer>
+
+ <developer>
+ <name>Ate Douma</name>
+ <id>ate</id>
+ <email>ate#aT#apache.d0t.org</email>
+ <timezone>+2</timezone>
+ <organization>Hippo</organization>
+ <organizationUrl>http://www.onehippo.com</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ </developers>
+
+
+ <!-- Pluto Contributors ================================================== -->
+
+ <contributors>
+ <contributor>
+ <name>Michael Westbay</name>
+ <email>westbay#a@T#users.d0t.sourceforge.d0t.net</email>
+ </contributor>
+ <contributor>
+ <name>Ken Weiner</name>
+ <email>kweiner#a@T#unicon.d0t.net</email>
+ </contributor>
+ <contributor>
+ <name>Ken Atherton</name>
+ <email>katherto#a@T#visa.d0t.com</email>
+ </contributor>
+ <contributor>
+ <name>David Hay</name>
+ </contributor>
+
+ <contributor>
+
+ </contributor>
+ </contributors>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/portals/pluto/trunk</url>
</scm>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+
+ <!-- Dependency Version Properties ======================================= -->
+
+ <!--
+ NOTE:
+
+ Modification of these properties affects:
+ 1) maven-pluto-plugin/src/main/resources/versions.properties as well!
+ -->
+ <properties>
+ <pluto.container.name>Pluto</pluto.container.name>
+ <javax.portlet.version.major>2</javax.portlet.version.major>
+ <javax.portlet.version.minor>0</javax.portlet.version.minor>
+ <portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
+ <servlet-api.version>2.4</servlet-api.version>
+ <jsp-api.version>2.0</jsp-api.version>
+ <jstl.version>1.1.2</jstl.version>
+ <taglibs.standard.version>1.1.2</taglibs.standard.version>
+ <jaxb.version>2.1</jaxb.version>
+ <jaxb-impl.version>2.1.9</jaxb-impl.version>
+ <stax.impl.version>1.2.0</stax.impl.version>
+ <commons-digester.version>1.8</commons-digester.version>
+ <commons-cli.version>1.0</commons-cli.version>
+ <slf4j.version>1.5.6</slf4j.version>
+ <springframework.version>2.0.2</springframework.version>
+ <maven.version>2.0.5</maven.version>
+ <ant.version>1.6.5</ant.version>
+ <commons-io.version>1.3.1</commons-io.version>
+ <ccpp-api.version>1.0</ccpp-api.version>
+ <junit.version>4.0</junit.version>
+ <jmock.version>1.2.0</jmock.version>
+ <xmlunit.version>1.1</xmlunit.version>
+
+ <!-- The following properties are not directly used as maven
+ dependencies, they're used by the maven pluto plugin for
+ handling installation dependencies
+ TODO: Check if we need all of them. -->
+ <xerces.version>2.6.2</xerces.version>
+ <xalan.version>2.7.0</xalan.version>
+ <castor.version>1.1.1</castor.version>
+ <commons-collections.version>3.2</commons-collections.version>
+ <commons-httpclient.version>3.0</commons-httpclient.version>
+ <commons-beanutils.version>1.7.0</commons-beanutils.version>
+ <log4j.version>1.2.14</log4j.version>
+ <activation.version>1.1</activation.version>
+ <ccpp-ri.version>1.0</ccpp-ri.version>
+ <rdffilter.version>1.0</rdffilter.version>
+ <jena.version>1.4.0</jena.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Logging =========================================== -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Specification Libraries =========================================== -->
+ <dependency>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
+ <version>${portals.portlet2-api-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>${stax.impl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- CCPP Libraries -->
+ <dependency>
+ <groupId>javax.ccpp</groupId>
+ <artifactId>ccpp</artifactId>
+ <version>${ccpp-api.version}</version>
+ </dependency>
+
+ <!-- Testing Libraries ================================================= -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>${jmock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <version>${jmock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>${xmlunit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Misc ================================================= -->
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${taglibs.standard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${springframework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons-digester.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <supplementalModels>
+ <supplementalModel>
+ ${project.basedir}/../pluto-site/src/main/appended-resources/supplemental-models.xml
+ </supplementalModel>
+ </supplementalModels>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ </plugins>
+
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-alpha-5</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ftp</artifactId>
+ <version>1.0-alpha-6</version>
+ </extension>
+ </extensions>
+
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>assembly</id>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<!-- Pluto Modules ======================================================= -->
<modules>
@@ -69,5 +646,4 @@
<!--module>pluto-site</module-->
<module>pluto-site-skin</module>
</modules>
-
</project>