Update of /var/cvs/contributions/CMSContainer_Portlets
In directory james.mmbase.org:/tmp/cvs-serv32039
Modified Files:
.classpath pom.xml
Log Message:
CMSC-1330 Upgrade CMSc to use MMBase 1.9
CMSC-215 Upgrade from Maven 1 to Maven 2
Upgrade mmbase-1.8.7-20090402
See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1330
See also: http://www.mmbase.org/jira/browse/CMSC-215
Index: .classpath
===================================================================
RCS file: /var/cvs/contributions/CMSContainer_Portlets/.classpath,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- .classpath 26 Feb 2009 12:19:35 -0000 1.34
+++ .classpath 14 Apr 2009 10:20:23 -0000 1.35
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="portlets-banner/target/classes"
path="portlets-banner/src/java"/>
- <classpathentry kind="src" output="portlets-tagcloud/target/classes"
path="portlets-tagcloud/src/java"/>
- <classpathentry kind="src"
output="portlets-randomcontent/target/classes"
path="portlets-randomcontent/src/java"/>
- <classpathentry kind="src" output="portlets-jforum/target/classes"
path="portlets-jforum/src/java"/>
- <classpathentry kind="src" output="portlets-secure/target/classes"
path="portlets-secure/src/java"/>
- <classpathentry kind="src"
output="portlets-dynamicforms/target/classes"
path="portlets-dynamicforms/src/java"/>
- <classpathentry kind="src" output="portlets-ecard/target/classes"
path="portlets-ecard/src/java"/>
- <classpathentry kind="src" output="portlets-emailalert/target/classes"
path="portlets-emailalert/src/java"/>
- <classpathentry kind="src" output="portlets-googlemap/target/classes"
path="portlets-googlemap/src/java"/>
- <classpathentry kind="src" output="portlets-guestbook/target/classes"
path="portlets-guestbook/src/java"/>
- <classpathentry kind="src" output="portlets-maileditors/target/classes"
path="portlets-maileditors/src/java"/>
- <classpathentry kind="src" output="portlets-mailfriend/target/classes"
path="portlets-mailfriend/src/java"/>
- <classpathentry kind="src" output="portlets-login/target/classes"
path="portlets-login/src/java"/>
- <classpathentry kind="src" output="portlets-playlist/target/classes"
path="portlets-playlist/src/java"/>
- <classpathentry kind="src" output="portlets-poll/target/classes"
path="portlets-poll/src/java"/>
- <classpathentry kind="src" output="portlets-print/target/classes"
path="portlets-print/src/java"/>
- <classpathentry kind="src" output="portlets-search/target/classes"
path="portlets-search/src/java"/>
- <classpathentry kind="src" output="portlets-newsletter/target/classes"
path="portlets-newsletter/src/java"/>
- <classpathentry kind="src" output="portlets-preferences/target/classes"
path="portlets-preferences/src/java"/>
+ <classpathentry kind="src" path="portlets-banner/src/java"/>
+ <classpathentry kind="src" path="portlets-tagcloud/src/java"/>
+ <classpathentry kind="src" path="portlets-randomcontent/src/java"/>
+ <classpathentry kind="src" path="portlets-jforum/src/java"/>
+ <classpathentry kind="src" path="portlets-secure/src/java"/>
+ <classpathentry kind="src" path="portlets-dynamicforms/src/java"/>
+ <classpathentry kind="src" path="portlets-ecard/src/java"/>
+ <classpathentry kind="src" path="portlets-emailalert/src/java"/>
+ <classpathentry kind="src" path="portlets-googlemap/src/java"/>
+ <classpathentry kind="src" path="portlets-guestbook/src/java"/>
+ <classpathentry kind="src" path="portlets-maileditors/src/java"/>
+ <classpathentry kind="src" path="portlets-mailfriend/src/java"/>
+ <classpathentry kind="src" path="portlets-login/src/java"/>
+ <classpathentry kind="src" path="portlets-playlist/src/java"/>
+ <classpathentry kind="src" path="portlets-poll/src/java"/>
+ <classpathentry kind="src" path="portlets-print/src/java"/>
+ <classpathentry kind="src" path="portlets-search/src/java"/>
+ <classpathentry kind="src" path="portlets-newsletter/src/java"/>
+ <classpathentry kind="src" path="portlets-preferences/src/java"/>
<classpathentry combineaccessrules="false" kind="src"
path="/CMSContainer_Modules-1_7"/>
<classpathentry combineaccessrules="false" kind="src"
path="/CMSContainer-1_7"/>
<classpathentry kind="var"
path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.7.0.jar">
@@ -89,7 +89,7 @@
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-descriptors-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090103.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090402.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
@@ -99,27 +99,27 @@
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090103.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090402.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090103.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090402.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090103.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090402.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090103.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090402.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090103.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090402.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
Index: pom.xml
===================================================================
RCS file: /var/cvs/contributions/CMSContainer_Portlets/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- pom.xml 26 Feb 2009 12:19:35 -0000 1.3
+++ pom.xml 14 Apr 2009 10:20:23 -0000 1.4
@@ -1,183 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>finalist</groupId>
- <artifactId>portlets</artifactId>
- <packaging>pom</packaging>
- <name>portlets</name>
+
+ <parent>
+ <groupId>org.cmscontainer</groupId>
+ <artifactId>cmsc-project</artifactId>
<version>1.7-SNAPSHOT</version>
- <properties>
- <cmsc.version>1.7-SNAPSHOT</cmsc.version>
- <cmscportlets.version>1.7-SNAPSHOT</cmscportlets.version>
- <mmbase.version>1.8.7-20090103</mmbase.version>
- </properties>
+ </parent>
+
+ <groupId>org.cmscontainer.portlets</groupId>
+ <artifactId>cmsc-portlets</artifactId>
+ <name>CMS Container Portlets</name>
+ <packaging>pom</packaging>
+
<modules>
- <module>portlets-emailalert</module>
<module>portlets-banner</module>
- <module>portlets-maileditors</module>
- <module>portlets-jforum</module>
+ <module>portlets-calendar</module>
+ <module>portlets-dynamicforms</module>
+ <module>portlets-dynamicforms2</module>
+ <module>portlets-ecard</module>
+ <module>portlets-emailalert</module>
+ <module>portlets-gallery</module>
<module>portlets-googlemap</module>
- <module>portlets-mailfriend</module>
<module>portlets-guestbook</module>
- <module>portlets-calendar</module>
+ <module>portlets-jforum</module>
<module>portlets-login</module>
+ <module>portlets-maileditors</module>
+ <module>portlets-mailfriend</module>
<module>portlets-newsletter</module>
- <module>portlets-dynamicforms</module>
- <module>portlets-gallery</module>
- <module>portlets-ecard</module>
<module>portlets-playlist</module>
<module>portlets-poll</module>
<module>portlets-preferences</module>
<module>portlets-print</module>
+ <module>portlets-randomcontent</module>
<module>portlets-search</module>
<module>portlets-secure</module>
<module>portlets-tagcloud</module>
<module>portlets-teaser</module>
</modules>
- <repositories>
- <!-- use local m1 repo-->
- <!--repository>
- <id>m1-local-reps</id>
- <name>Maven1 Repo</name>
- <url>file://${user.home}/.maven/repository</url>
- <layout>legacy</layout>
- </repository-->
- <!-- use finalist cmsc repo-->
- <repository>
- <id>cmsc-reps</id>
- <name>Cmsc maven repository</name>
- <url>http://maven.finalist.hk/content/groups/cmsc/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<dependencies>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-contentrepository</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cmscontainer.core</groupId>
+ <artifactId>cmsc-edit-webapp</artifactId>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-portal</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-portlets</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-security</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-servicemanagement</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-sitemanagement</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-taglib</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.core</groupId>
<artifactId>cmsc-utilities</artifactId>
- <version>${cmsc.version}</version>
- </dependency>
- <dependency>
- <groupId>mmbase</groupId>
- <artifactId>mmbase-email</artifactId>
- <version>${mmbase.version}</version>
- </dependency>
- <dependency>
- <groupId>javamail</groupId>
- <artifactId>mail</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <!-- The test is not use now, as jforum and newsletter test sources is
not right-->
- <!--testSourceDirectory>src/test</testSourceDirectory-->
- <resources>
- <resource>
- <directory>${basedir}/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-2</version>
- <configuration>
-
<warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
- <archiveClasses>true</archiveClasses>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>make-a-jar</id>
- <phase>compile</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <packaging>jar</packaging>
- <artifactId>${project.artifactId}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <file>
-
${project.build.directory}/${project.artifactId}-${project.version}.jar
- </file>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
