Author: piergiorgiolucidi Date: 2009-03-03 13:56:10 -0500 (Tue, 03 Mar 2009) New Revision: 250 Added: contrib/wikiPortlet/trunk/.mymetadata contrib/wikiPortlet/trunk/assembly.xml Modified: contrib/wikiPortlet/trunk/.classpath contrib/wikiPortlet/trunk/.project contrib/wikiPortlet/trunk/pom.xml Log: - Portal 2.7.x support: configuration files, TODO delete old Maven files Modified: contrib/wikiPortlet/trunk/.classpath =================================================================== --- contrib/wikiPortlet/trunk/.classpath 2009-03-03 18:54:59 UTC (rev 249) +++ contrib/wikiPortlet/trunk/.classpath 2009-03-03 18:56:10 UTC (rev 250) @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="wiki-management/src/java"/> - <classpathentry kind="src" path="wiki-test/src/java"/> - <classpathentry kind="src" path="wiki-test/src/etc"/> - <classpathentry kind="src" path="wiki-common/src/etc"/> - <classpathentry kind="src" path="wiki-common/src/java"/> - <classpathentry kind="src" path="wiki-management/src/test"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="wiki-management/src/java"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="forge-wiki/src/java"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="forge-wiki/src/test"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="wiki-test/src/java"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="wiki-test/src/etc"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="wiki-common/src/etc"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="wiki-common/src/java"/> + <classpathentry kind="src" output="WebRoot/WEB-INF/classes" path="wiki-management/src/test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="output" path="WebRoot/WEB-INF/classes"/> </classpath> Added: contrib/wikiPortlet/trunk/.mymetadata =================================================================== --- contrib/wikiPortlet/trunk/.mymetadata (rev 0) +++ contrib/wikiPortlet/trunk/.mymetadata 2009-03-03 18:56:10 UTC (rev 250) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-module + type="WEB" + name="JBossWiki" + id="myeclipse.1235499040360" + context-root="/" + j2ee-spec="5.0" + archive="JBossWiki.war"> + <attributes> + <attribute name="webrootdir" value="WebRoot" /> + </attributes> +</project-module> + Modified: contrib/wikiPortlet/trunk/.project =================================================================== --- contrib/wikiPortlet/trunk/.project 2009-03-03 18:54:59 UTC (rev 249) +++ contrib/wikiPortlet/trunk/.project 2009-03-03 18:56:10 UTC (rev 250) @@ -6,17 +6,38 @@ </projects> <buildSpec> <buildCommand> + <name>com.genuitec.eclipse.j2eedt.core.WebClasspathBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> + <name>com.genuitec.eclipse.j2eedt.core.J2EEProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.genuitec.eclipse.j2eedt.core.DeploymentDescriptorValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>com.genuitec.eclipse.j2eedt.core.webnature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> Added: contrib/wikiPortlet/trunk/assembly.xml =================================================================== Modified: contrib/wikiPortlet/trunk/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/pom.xml 2009-03-03 18:54:59 UTC (rev 249) +++ contrib/wikiPortlet/trunk/pom.xml 2009-03-03 18:56:10 UTC (rev 250) @@ -1,13 +1,11 @@ -<!-- - JBoss, the OpenSource J2EE webOS Distributable under LGPL license. See - terms of license at gnu.org. - Maven manual install: portal-core-lib.jar - portal-portlet-lib javax-servlet.jar javax-servlet-jsp.jar - activation.jar jboss-ejb3x.jar jboss-ejb3.jar portal-identity-lib.jar - jboss-portlet-api-lib.jar - - author: Piergiorgio Lucidi ---> + + <!-- + JBoss, the OpenSource J2EE webOS Distributable under LGPL license. See + terms of license at gnu.org. Maven manual install: portal-core-lib.jar + portal-portlet-lib javax-servlet.jar javax-servlet-jsp.jar + activation.jar jboss-ejb3x.jar jboss-ejb3.jar portal-identity-lib.jar + jboss-portlet-api-lib.jar author: Piergiorgio Lucidi + --> <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> @@ -81,7 +79,7 @@ <dependency> <groupId>jboss</groupId> <artifactId>portal-identity-lib</artifactId> - <version>1.0</version> + <version>2.7.1</version> <scope>provided</scope> </dependency> <dependency> @@ -138,5 +136,34 @@ <version>1.0</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <version>5.0-1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>activation</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>portal-api-lib</artifactId> + <version>2.7.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> </dependencies> </project>