March 2009 - portletswap-commits - Jboss List Archives

JBoss PortletSwap SVN: r261 - in contrib/wikiPortlet/trunk: .settings and 7 other directories.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-27 15:42:00 -0400 (Fri, 27 Mar 2009) New Revision: 261 Added: contrib/wikiPortlet/trunk/wiki-ear/ contrib/wikiPortlet/trunk/wiki-ear/pom.xml Modified: contrib/wikiPortlet/trunk/.settings/org.eclipse.jdt.core.prefs contrib/wikiPortlet/trunk/forge-wiki/pom.xml contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java contrib/wikiPortlet/trunk/pom.xml contrib/wikiPortlet/trunk/wiki-common/pom.xml contrib/wikiPortlet/trunk/wiki-common/src/etc/org/jboss/wiki/filedatasource.properties contrib/wikiPortlet/trunk/wiki-management/pom.xml contrib/wikiPortlet/trunk/wiki-test/pom.xml Log: - added JBoss Wiki EAR module: a standard Maven 2 module to create EAR package - refactoring of POM dependencies Modified: contrib/wikiPortlet/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- contrib/wikiPortlet/trunk/.settings/org.eclipse.jdt.core.prefs 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/.settings/org.eclipse.jdt.core.prefs 2009-03-27 19:42:00 UTC (rev 261) @@ -1,12 +1,12 @@ -#Mon Jan 26 16:44:32 CET 2009 +#Tue Mar 24 17:54:54 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: contrib/wikiPortlet/trunk/forge-wiki/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-03-27 19:42:00 UTC (rev 261) @@ -52,6 +52,12 @@ <outputDirectory>${basedir}/src/web/WEB-INF/classes</outputDirectory> <resources> <resource> + <excludes> + <exclude>**/.svn</exclude> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> + </excludes> <directory>src/etc/</directory> <includes> <include>**/*.properties</include> @@ -66,8 +72,7 @@ <configuration> <webappDirectory>${basedir}/src/web/</webappDirectory> <warSourceDirectory>${basedir}/src/web/</warSourceDirectory> - <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> - <excludes>**/.svn/**</excludes> + <warSourceExcludes>WEB-INF/lib/*.jar,**/.svn,.svn/**/*,**/.svn/**,**/.DS_Store</warSourceExcludes> <warName>wiki</warName> <outputDirectory>target/wiki.ear</outputDirectory> </configuration> @@ -89,12 +94,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6</version> @@ -108,27 +107,14 @@ </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> + <artifactId>wiki-common</artifactId> <version>1.0</version> <scope>provided</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <scope>provided</scope> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>2.0</version> </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>wiki-common</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> </dependencies> </project> Modified: contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2009-03-27 19:42:00 UTC (rev 261) @@ -32,6 +32,7 @@ import javax.portlet.ActionRequest; import javax.portlet.PortletException; +import javax.portlet.PortletPreferences; import javax.portlet.PortletSession; import org.apache.commons.fileupload.FileItem; @@ -62,22 +63,16 @@ public class WikiPortlet extends JBossPortlet { final static String jspPath = "/WEB-INF/jsp/"; - private static final String WINDOWS_FILE_NAME = "\\w:\\\\.+"; - private String defaultPage = "Main"; - private WikiEngine wikiEngine; - private Logger log; + public void init() { log = Logger.getLogger(WikiPortlet.class); - - WikiCommon wikiCommon = new WikiCommon(); - try { - WikiServiceManagement wikiServiceMenagement = wikiCommon + WikiServiceManagement wikiServiceMenagement = WikiCommon .getWikiManagement(); wikiEngine = wikiServiceMenagement.getWikiEngine(); } catch (WikiManagementNotFoundException e1) { @@ -110,16 +105,11 @@ return convertedParameters; } - + public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { - Map<String, String> convertedParameters = convertParameters(rReq); - Credentials credentials = wikiEngine.getCredentialsInstance(rReq); - - - // wikiContext is null - to get refernece to actual page WikiContext wikiContext = null; @@ -202,10 +192,12 @@ String msg = "File Upload Exception: " + fue.getMessage(); rResp.setRenderParameter("error", msg); getPortletContext().log(msg, fue); + log.error("File Upload Exception", fue); } catch (Exception e) { String msg = "Exception: " + e.getMessage(); rResp.setRenderParameter("error", msg); getPortletContext().log(msg, e); + log.error("Exception", e); } } @@ -349,11 +341,14 @@ public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { try { + PortletPreferences prefs = rReq.getPreferences(); WikiSession wikiSession = new PortletWikiSession(rReq .getPortletSession()); - + Credentials credentials = wikiEngine.getCredentialsInstance(rReq); + + String langCode = rReq.getParameter("language"); if (langCode == null) { @@ -640,4 +635,5 @@ portletSession.setAttribute(WikiSession.ACTION_URL, wikiURL); portletSession.setAttribute(WikiSession.IS_SECURE, isSecure); } + } \ No newline at end of file Modified: contrib/wikiPortlet/trunk/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/pom.xml 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/pom.xml 2009-03-27 19:42:00 UTC (rev 261) @@ -23,6 +23,7 @@ <module>wiki-common</module> <module>wiki-management</module> <module>wiki-test</module> + <module>wiki-ear</module> </modules> <groupId>jboss</groupId> <artifactId>wiki</artifactId> @@ -170,6 +171,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> + <scope>provided</scope> </dependency> </dependencies> </project> Modified: contrib/wikiPortlet/trunk/wiki-common/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-03-27 19:42:00 UTC (rev 261) @@ -68,6 +68,12 @@ </resource> <resource> <directory>src/etc/</directory> + <excludes> + <exclude>**/.svn</exclude> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> + </excludes> <includes> <include>**/*.properties</include> <include>**/*.xml</include> @@ -89,6 +95,12 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.2</version> <configuration> + <excludes> + <exclude>**/.svn</exclude> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> + </excludes> <finalName>wiki-common</finalName> <outputDirectory>../target/wiki.ear/lib</outputDirectory> <archive> @@ -107,12 +119,6 @@ </build> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6</version> @@ -126,51 +132,9 @@ </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-portlet-api-lib</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-identity-lib</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId> <version>3.2.3</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-portlet-lib</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-common-lib</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> </dependencies> </project> Modified: contrib/wikiPortlet/trunk/wiki-common/src/etc/org/jboss/wiki/filedatasource.properties =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/src/etc/org/jboss/wiki/filedatasource.properties 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/wiki-common/src/etc/org/jboss/wiki/filedatasource.properties 2009-03-27 19:42:00 UTC (rev 261) @@ -5,4 +5,3 @@ # pathToAttachements - points, where JSPWiki attachemets are situated pathToAttachements = /tmp - Added: contrib/wikiPortlet/trunk/wiki-ear/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-ear/pom.xml (rev 0) +++ contrib/wikiPortlet/trunk/wiki-ear/pom.xml 2009-03-27 19:42:00 UTC (rev 261) @@ -0,0 +1,73 @@ +<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>jboss</groupId> + <artifactId>wiki</artifactId> + <version>1.0</version> + </parent> + <groupId>jboss</groupId> + <artifactId>wiki-ear</artifactId> + <packaging>ear</packaging> + <name>JBoss Wiki EAR</name> + <description>JBoss Wiki EAR</description> + <dependencies> + <dependency> + <groupId>jboss</groupId> + <artifactId>wiki-common</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>forge-wiki</artifactId> + <version>1.0</version> + <type>war</type> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>wiki-management</artifactId> + <version>1.0</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>wiki-test</artifactId> + <version>1.0</version> + <type>war</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>JBoss Labs - forge infrastructure</displayName> + <finalName>wiki</finalName> + <modules> + <javaModule> + <groupId>jboss</groupId> + <artifactId>wiki-common</artifactId> + <bundleDir>lib</bundleDir> + </javaModule> + <ejbModule> + <groupId>jboss</groupId> + <artifactId>wiki-management</artifactId> + <uri>wiki-management.jar</uri> + </ejbModule> + <webModule> + <groupId>jboss</groupId> + <artifactId>forge-wiki</artifactId> + <contextRoot>/wiki</contextRoot> + </webModule> + <webModule> + <groupId>jboss</groupId> + <artifactId>wiki-test</artifactId> + <contextRoot>/test</contextRoot> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Modified: contrib/wikiPortlet/trunk/wiki-management/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-03-27 19:42:00 UTC (rev 261) @@ -49,6 +49,12 @@ <sourceDirectory>src/java</sourceDirectory> <resources> <resource> + <excludes> + <exclude>**/.svn</exclude> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> + </excludes> <directory>src/etc/</directory> <includes> <include>**/*.properties</include> @@ -69,6 +75,12 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.2</version> <configuration> + <excludes> + <exclude>**/.svn</exclude> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> + </excludes> <finalName>wiki-management</finalName> <outputDirectory>../target/wiki.ear</outputDirectory> <archive> @@ -110,11 +122,5 @@ <version>1.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> </dependencies> </project> Modified: contrib/wikiPortlet/trunk/wiki-test/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-test/pom.xml 2009-03-11 14:41:25 UTC (rev 260) +++ contrib/wikiPortlet/trunk/wiki-test/pom.xml 2009-03-27 19:42:00 UTC (rev 261) @@ -46,10 +46,15 @@ </developer> </developers> <build> - <sourceDirectory>src/java</sourceDirectory> <resources> <resource> + <excludes> + <exclude>**/.svn</exclude> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> + </excludes> <directory>src/etc/</directory> <includes> <include>**/*.properties</include> @@ -64,8 +69,7 @@ <configuration> <webappDirectory>${basedir}/src/web/</webappDirectory> <warSourceDirectory>${basedir}/src/web/</warSourceDirectory> - <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> - <excludes>**/.svn/**</excludes> + <warSourceExcludes>WEB-INF/lib/*.jar,**/.svn,.svn/**/*,**/.svn/**,**/.DS_Store</warSourceExcludes> <warName>wiki-test</warName> <outputDirectory>target/wiki.ear</outputDirectory> </configuration>

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r260 - in contrib/wikiPortlet/trunk: forge-wiki and 3 other directories.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-11 10:41:25 -0400 (Wed, 11 Mar 2009) New Revision: 260 Modified: contrib/wikiPortlet/trunk/forge-wiki/pom.xml contrib/wikiPortlet/trunk/pom.xml contrib/wikiPortlet/trunk/wiki-common/pom.xml contrib/wikiPortlet/trunk/wiki-management/pom.xml contrib/wikiPortlet/trunk/wiki-test/pom.xml Log: - bugfix: solved a problem with installing on Maven repository wiki-common - some refactoring on Maven poms Modified: contrib/wikiPortlet/trunk/forge-wiki/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-03-10 15:46:47 UTC (rev 259) +++ contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-03-11 14:41:25 UTC (rev 260) @@ -1,9 +1,15 @@  <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"> @@ -140,12 +149,6 @@ <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> Modified: contrib/wikiPortlet/trunk/wiki-common/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-03-10 15:46:47 UTC (rev 259) +++ contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-03-11 14:41:25 UTC (rev 260) @@ -1,9 +1,15 @@ <!-- 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 + 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 @@ -155,12 +161,6 @@ <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>javax.portlet</groupId> <artifactId>portlet-api</artifactId> <version>1.0</version> Modified: contrib/wikiPortlet/trunk/wiki-management/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-03-10 15:46:47 UTC (rev 259) +++ contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-03-11 14:41:25 UTC (rev 260) @@ -1,9 +1,15 @@ <!-- 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 + 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 @@ -105,28 +111,10 @@ <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>javax.portlet</groupId> <artifactId>portlet-api</artifactId> <version>1.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> </dependencies> </project> Modified: contrib/wikiPortlet/trunk/wiki-test/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-test/pom.xml 2009-03-10 15:46:47 UTC (rev 259) +++ contrib/wikiPortlet/trunk/wiki-test/pom.xml 2009-03-11 14:41:25 UTC (rev 260) @@ -1,9 +1,15 @@ <!-- 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 + 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 @@ -81,18 +87,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.9</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>1.1</version> @@ -122,17 +116,5 @@ <version>1.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> </dependencies> </project>

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r259 - in contrib/wikiPortlet/trunk: forge-wiki and 3 other directories.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-10 11:46:47 -0400 (Tue, 10 Mar 2009) New Revision: 259 Modified: contrib/wikiPortlet/trunk/forge-wiki/pom.xml contrib/wikiPortlet/trunk/pom.xml contrib/wikiPortlet/trunk/wiki-common/pom.xml contrib/wikiPortlet/trunk/wiki-management/pom.xml contrib/wikiPortlet/trunk/wiki-test/pom.xml Log: - pom.xml updated: now build process create wiki.ear exploded directory that can be deployed exporting directly on JBoss Portal, instead only ear contents. Modified: contrib/wikiPortlet/trunk/forge-wiki/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-03-09 15:57:04 UTC (rev 258) +++ contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-03-10 15:46:47 UTC (rev 259) @@ -36,6 +36,9 @@ <url>http://www.open4dev.com/</url> <organization>Sourcesense</organization> <organizationUrl>http://www.sourcesense.com/</organizationUrl> + <roles> + <role>Project Lead</role> + </roles> </developer> </developers> <build> @@ -60,7 +63,7 @@ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <excludes>**/.svn/**</excludes> <warName>wiki</warName> - <outputDirectory>target</outputDirectory> + <outputDirectory>target/wiki.ear</outputDirectory> </configuration> </plugin> <plugin> Modified: contrib/wikiPortlet/trunk/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/pom.xml 2009-03-09 15:57:04 UTC (rev 258) +++ contrib/wikiPortlet/trunk/pom.xml 2009-03-10 15:46:47 UTC (rev 259) @@ -34,6 +34,9 @@ <url>http://www.open4dev.com/</url> <organization>Sourcesense</organization> <organizationUrl>http://www.sourcesense.com/</organizationUrl> + <roles> + <role>Project Lead</role> + </roles> </developer> </developers> <build> Modified: contrib/wikiPortlet/trunk/wiki-common/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-03-09 15:57:04 UTC (rev 258) +++ contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-03-10 15:46:47 UTC (rev 259) @@ -34,6 +34,9 @@ <url>http://www.open4dev.com/</url> <organization>Sourcesense</organization> <organizationUrl>http://www.sourcesense.com/</organizationUrl> + <roles> + <role>Project Lead</role> + </roles> </developer> </developers> <build> @@ -45,7 +48,7 @@ <include>**/*.txt</include> <include>**/*.xml</include> </includes> - <targetPath>../../../target/</targetPath> + <targetPath>../../../target/wiki.ear</targetPath> </resource> <resource> <directory>src/etc/images</directory> @@ -81,7 +84,7 @@ <version>2.2</version> <configuration> <finalName>wiki-common</finalName> - <outputDirectory>../target/lib</outputDirectory> + <outputDirectory>../target/wiki.ear/lib</outputDirectory> <archive> <manifest> <addClasspath>true</addClasspath> Modified: contrib/wikiPortlet/trunk/wiki-management/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-03-09 15:57:04 UTC (rev 258) +++ contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-03-10 15:46:47 UTC (rev 259) @@ -32,11 +32,11 @@ <name>Piergiorgio Lucidi</name> <email>p.lucidi(a)sourcesense.com</email> <url>http://www.open4dev.com/</url> + <organization>Sourcesense</organization> + <organizationUrl>http://www.sourcesense.com/</organizationUrl> <roles> <role>Project Lead</role> </roles> - <organization>Sourcesense</organization> - <organizationUrl>http://www.sourcesense.com/</organizationUrl> </developer> </developers> <build> @@ -64,7 +64,7 @@ <version>2.2</version> <configuration> <finalName>wiki-management</finalName> - <outputDirectory>../target/</outputDirectory> + <outputDirectory>../target/wiki.ear</outputDirectory> <archive> <manifest> <addClasspath>true</addClasspath> Modified: contrib/wikiPortlet/trunk/wiki-test/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-test/pom.xml 2009-03-09 15:57:04 UTC (rev 258) +++ contrib/wikiPortlet/trunk/wiki-test/pom.xml 2009-03-10 15:46:47 UTC (rev 259) @@ -34,6 +34,9 @@ <url>http://www.open4dev.com/</url> <organization>Sourcesense</organization> <organizationUrl>http://www.sourcesense.com/</organizationUrl> + <roles> + <role>Project Lead</role> + </roles> </developer> </developers> <build> @@ -58,7 +61,7 @@ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <excludes>**/.svn/**</excludes> <warName>wiki-test</warName> - <outputDirectory>target</outputDirectory> + <outputDirectory>target/wiki.ear</outputDirectory> </configuration> </plugin> <plugin>

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r258 - in contrib/wikiPortlet/trunk: forge-wiki/src/java/org/jboss/wiki and 1 other directory.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-09 11:57:04 -0400 (Mon, 09 Mar 2009) New Revision: 258 Added: contrib/wikiPortlet/trunk/binaries/jboss/jars/portal-api-lib.jar Modified: contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java Log: - added portal-api-lib as binary for Maven 2 repository Added: contrib/wikiPortlet/trunk/binaries/jboss/jars/portal-api-lib.jar =================================================================== (Binary files differ) Property changes on: contrib/wikiPortlet/trunk/binaries/jboss/jars/portal-api-lib.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2009-03-04 16:06:23 UTC (rev 257) +++ contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2009-03-09 15:57:04 UTC (rev 258) @@ -53,9 +53,9 @@ * The WikiPortlet. * <p> * + * @author <a href="mailto:piergiorgiolucidi@gmail.com">Piergiorgio Lucidi</a> * @author <a href="mailto:dsicore@jboss.org">Damon Sicore</a> * @author <a href="mailto:tomasz.szymanski@jboss.com">Tomasz Szymanski</a> - * @author <a href="mailto:piergiorgiolucidi@gmail.com">Piergiorgio Lucidi</a> * @version $Id$ */

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r257 - contrib/wikiPortlet/tags.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-04 11:06:23 -0500 (Wed, 04 Mar 2009) New Revision: 257 Added: contrib/wikiPortlet/tags/1.0/ Log: - the project now is based on Maven 2 - added support for Portal 2.7.x Copied: contrib/wikiPortlet/tags/1.0 (from rev 256, contrib/wikiPortlet/trunk)

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r256 - in contrib/wikiPortlet/trunk: wiki-common and 2 other directories.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-04 10:54:11 -0500 (Wed, 04 Mar 2009) New Revision: 256 Removed: contrib/wikiPortlet/trunk/forge-wiki/maven.xml contrib/wikiPortlet/trunk/forge-wiki/project.properties contrib/wikiPortlet/trunk/forge-wiki/project.xml contrib/wikiPortlet/trunk/wiki-common/maven.xml contrib/wikiPortlet/trunk/wiki-common/project.properties contrib/wikiPortlet/trunk/wiki-common/project.xml contrib/wikiPortlet/trunk/wiki-management/maven.xml contrib/wikiPortlet/trunk/wiki-management/project.properties contrib/wikiPortlet/trunk/wiki-management/project.xml contrib/wikiPortlet/trunk/wiki-test/maven.xml contrib/wikiPortlet/trunk/wiki-test/project.properties contrib/wikiPortlet/trunk/wiki-test/project.xml Log: Maven 1 files deleted Deleted: contrib/wikiPortlet/trunk/forge-wiki/maven.xml =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/maven.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/forge-wiki/maven.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,31 +0,0 @@ - -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" > - <goal name="build"> - - <attainGoal name="war" /> - - </goal> - - <goal name="deploy"> - -  - - </goal> - - <goal name="all"> - <attainGoal name="build" /> - <attainGoal name="deploy" /> - </goal> - -</project> Deleted: contrib/wikiPortlet/trunk/forge-wiki/project.properties =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/project.properties 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/forge-wiki/project.properties 2009-03-04 15:54:11 UTC (rev 256) @@ -1,6 +0,0 @@ -maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ -maven.junit.fork=yes -maven.war.src=${basedir}/src/web -maven.jar.includes=**/WikiEngine.class -maven.ejb.includes=**/WikiService* -maven.ear.final.name=wiki.ear \ No newline at end of file Deleted: contrib/wikiPortlet/trunk/forge-wiki/project.xml =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/project.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/forge-wiki/project.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,138 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> - -<project> - <pomVersion>3</pomVersion> - <extend>../common.xml</extend> - <id>wiki</id> - <name>Wiki portlet and servlet</name> - <currentVersion>1.0</currentVersion> - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>**/*.properties</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.xml</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.types</include> - </resource> - </resources> - </build> - <organization> - <name>Tomasz Szymanski</name> - <url>http://mamut.net.pl</url> - </organization> - - <dependencies> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet</artifactId> - <version>1.0</version> - <jar>javax.servlet.jar</jar> - </dependency> - - <dependency> - <groupId>wiki-common</groupId> - <artifactId>wiki-common</artifactId> - <version>1.0</version> - <jar>wiki-common.jar</jar> - </dependency> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet.jsp</artifactId> - <version>1.0</version> - <jar>javax.servlet.jsp.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>activation</artifactId> - <version>1.0</version> - <jar>activation.jar</jar> - </dependency> - - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload.jar</artifactId> - <version>1.0</version> - <jar>commons-fileupload-1.0.jar</jar> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6</version> - </dependency> - - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> - <jar>jboss-ejb3x.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <jar>jboss-ejb3.jar</jar> - </dependency> - - <dependency> - <id>portlet-api</id> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>1.0</version> - <jar>jboss-jmx.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - <version>1.0</version> - <jar>jboss-common.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-common-lib</artifactId> - <version>1.0</version> - <jar>portal-common-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-core-lib</artifactId> - <version>1.0</version> - <jar>portal-core-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-portlet-lib</artifactId> - <version>1.0</version> - <jar>portal-portlet-lib.jar</jar> - </dependency> - </dependencies> -</project> Deleted: contrib/wikiPortlet/trunk/wiki-common/maven.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/maven.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-common/maven.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,40 +0,0 @@ - -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" > - <goal name="build"> - - <attainGoal name="jar" /> - -  - <ant:copy tofile="${maven.repo.local}/wiki-common/jars/wiki-common.jar" overwrite="true"> - <ant:fileset dir="target"> - <ant:filename name="wiki-common-1.0.jar" /> - </ant:fileset> - </ant:copy> - - </goal> - - <goal name="deploy"> -  -  - -  - </goal> - - <goal name="all"> - <attainGoal name="build" /> - <attainGoal name="deploy" /> - </goal> - -</project> Deleted: contrib/wikiPortlet/trunk/wiki-common/project.properties =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/project.properties 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-common/project.properties 2009-03-04 15:54:11 UTC (rev 256) @@ -1,7 +0,0 @@ -maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ -maven.junit.fork=yes -maven.war.src=${basedir}/src/web - -maven.jar.override=on - -maven.jar.shotoku-base=${ext.root.dir}/shotoku/shotoku-base/target/shotoku-base.jar Deleted: contrib/wikiPortlet/trunk/wiki-common/project.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/project.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-common/project.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,169 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> - -<project> - <pomVersion>3</pomVersion> - <extend>../common.xml</extend> - <id>wiki-common</id> - <name>Wiki common</name> - - <currentVersion>1.0</currentVersion> - <build> -  - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>**/*.properties</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.xml</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.types</include> - </resource> - </resources> - </build> - <organization> - <name>Tomasz Szymanski</name> - <url>http://mamut.net.pl</url> - </organization> - - <dependencies> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet</artifactId> - <version>1.0</version> - <jar>javax.servlet.jar</jar> - </dependency> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet.jsp</artifactId> - <version>1.0</version> - <jar>javax.servlet.jsp.jar</jar> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>activation</artifactId> - <version>1.0</version> - <jar>activation.jar</jar> - </dependency> - - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload.jar</artifactId> - <version>1.0</version> - <jar>commons-fileupload-1.0.jar</jar> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6</version> - </dependency> - - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> - <jar>jboss-ejb3x.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <jar>jboss-ejb3.jar</jar> - </dependency> - - <dependency> - <id>portlet-api</id> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>1.0</version> - <jar>jboss-jmx.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - <version>1.0</version> - <jar>jboss-common.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-common-lib</artifactId> - <version>1.0</version> - <jar>portal-common-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-core-lib</artifactId> - <version>1.0</version> - <jar>portal-core-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-portlet-lib</artifactId> - <version>1.0</version> - <jar>portal-portlet-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-portlet-api-lib</artifactId> - <version>1.0</version> - <jar>jboss-portlet-api-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-identity-lib</artifactId> - <version>1.0</version> - <jar>portal-identity-lib.jar</jar> - </dependency> - - - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossall-client</artifactId> - <version>3.2.3</version> - </dependency> - </dependencies> -</project> Deleted: contrib/wikiPortlet/trunk/wiki-management/maven.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-management/maven.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-management/maven.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,24 +0,0 @@ - -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" > - <goal name="build"> - <attainGoal name="ejb" /> - </goal> - - <goal name="deploy"> - -  - - </goal> - - <goal name="all"> - <attainGoal name="build" /> - <attainGoal name="deploy" /> - </goal> - -</project> Deleted: contrib/wikiPortlet/trunk/wiki-management/project.properties =================================================================== --- contrib/wikiPortlet/trunk/wiki-management/project.properties 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-management/project.properties 2009-03-04 15:54:11 UTC (rev 256) @@ -1,3 +0,0 @@ -maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ -maven.junit.fork=yes -maven.war.src=${basedir}/src/web Deleted: contrib/wikiPortlet/trunk/wiki-management/project.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-management/project.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-management/project.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,144 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> - -<project> - <pomVersion>3</pomVersion> - <extend>../common.xml</extend> - <id>wiki-management</id> - <name>Wiki Management(EJB3)</name> - <currentVersion>1.0</currentVersion> - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>**/*.properties</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.xml</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.types</include> - </resource> - </resources> - </build> - <organization> - <name>Tomasz Szymanski</name> - <url>http://mamut.net.pl</url> - </organization> - - <dependencies> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>1.0</version> - <jar>jboss-j2ee.jar</jar> - </dependency> - - <dependency> - <groupId>wiki-common</groupId> - <artifactId>wiki-common</artifactId> - <version>1.0</version> - <properties> -� � � � � � � � <ejb.manifest.classpath>true</ejb.manifest.classpath> -� � � � � � </properties> - <jar>wiki-common.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-mail</artifactId> - <version>1.0</version> - <jar>mail.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>activation</artifactId> - <version>1.0</version> - <jar>activation.jar</jar> - </dependency> - - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload.jar</artifactId> - <version>1.0</version> - <jar>commons-fileupload-1.0.jar</jar> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6</version> - </dependency> - - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> - <jar>jboss-ejb3x.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <jar>jboss-ejb3.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</artifactId> - <version>1.0</version> - <jar>jboss-annotations-ejb3.jar</jar> - </dependency> - - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>1.0</version> - <jar>jboss-jmx.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - <version>1.0</version> - <jar>jboss-common.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-common-lib</artifactId> - <version>1.0</version> - <jar>portal-common-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-core-lib</artifactId> - <version>1.0</version> - <jar>portal-core-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-portlet-lib</artifactId> - <version>1.0</version> - <jar>portal-portlet-lib.jar</jar> - </dependency> - - </dependencies> -</project> Deleted: contrib/wikiPortlet/trunk/wiki-test/maven.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-test/maven.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-test/maven.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,27 +0,0 @@ - -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" > - <goal name="build"> - - <attainGoal name="jar" /> - - <ant:copy file="target/wiki-test.jar" - tofile="target/wiki-test/WEB-INF/lib/wiki-test.jar" /> - - <attainGoal name="war" /> - - </goal> - - <goal name="deploy"> - - </goal> - - <goal name="all"> - <attainGoal name="build" /> - <attainGoal name="deploy" /> - </goal> - -</project> Deleted: contrib/wikiPortlet/trunk/wiki-test/project.properties =================================================================== --- contrib/wikiPortlet/trunk/wiki-test/project.properties 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-test/project.properties 2009-03-04 15:54:11 UTC (rev 256) @@ -1,11 +0,0 @@ -maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ -maven.junit.fork=yes -maven.war.src=${basedir}/src/web - -maven.final.name=${pom.artifactId} - -maven.jar.override=on - -maven.jar.shotoku-base=${ext.root.dir}/shotoku/shotoku-base/target/shotoku-base.jar - -maven.war.classes.excludes=**/test/*.class Deleted: contrib/wikiPortlet/trunk/wiki-test/project.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-test/project.xml 2009-03-03 20:17:59 UTC (rev 255) +++ contrib/wikiPortlet/trunk/wiki-test/project.xml 2009-03-04 15:54:11 UTC (rev 256) @@ -1,187 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> - -<project> - <pomVersion>3</pomVersion> - <extend>../common.xml</extend> - <id>wiki-test</id> - <name>Wiki test</name> - <currentVersion>1.0</currentVersion> - <build> -  - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>**/*.properties</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.xml</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.types</include> - </resource> - </resources> - </build> - <organization> - <name>Tomasz Szymanski</name> - <url>http://mamut.net.pl</url> - </organization> - - <dependencies> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.9</version> - </dependency> - - <dependency> - <groupId>wiki-common</groupId> - <artifactId>wiki-common</artifactId> - <version>1.0</version> - <properties> -� � � � � � � � <ejb.manifest.classpath>true</ejb.manifest.classpath> -� � � � � � </properties> - <jar>wiki-common.jar</jar> - </dependency> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet</artifactId> - <version>1.0</version> - <jar>javax.servlet.jar</jar> - </dependency> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet.jsp</artifactId> - <version>1.0</version> - <jar>javax.servlet.jsp.jar</jar> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>activation</artifactId> - <version>1.0</version> - <jar>activation.jar</jar> - </dependency> - - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload.jar</artifactId> - <version>1.0</version> - <jar>commons-fileupload-1.0.jar</jar> - </dependency> - - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.1</version> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6</version> - </dependency> - - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> - <jar>jboss-ejb3x.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> - <jar>jboss-ejb3.jar</jar> - </dependency> - - <dependency> - <id>portlet-api</id> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>1.0</version> - <jar>jboss-jmx.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - <version>1.0</version> - <jar>jboss-common.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-common-lib</artifactId> - <version>1.0</version> - <jar>portal-common-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-core-lib</artifactId> - <version>1.0</version> - <jar>portal-core-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-portlet-lib</artifactId> - <version>1.0</version> - <jar>portal-portlet-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossall-client</artifactId> - <version>3.2.3</version> - </dependency> - </dependencies> -</project>

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r255 - contrib/wikiPortlet/trunk.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-03 15:17:59 -0500 (Tue, 03 Mar 2009) New Revision: 255 Removed: contrib/wikiPortlet/trunk/build.properties contrib/wikiPortlet/trunk/build.properties.sample contrib/wikiPortlet/trunk/common.xml contrib/wikiPortlet/trunk/maven.xml contrib/wikiPortlet/trunk/project.properties contrib/wikiPortlet/trunk/project.xml Log: deleted Maven 1 files Deleted: contrib/wikiPortlet/trunk/build.properties =================================================================== --- contrib/wikiPortlet/trunk/build.properties 2009-03-03 20:11:58 UTC (rev 254) +++ contrib/wikiPortlet/trunk/build.properties 2009-03-03 20:17:59 UTC (rev 255) @@ -1,15 +0,0 @@ -# Path to where JBoss AS is to be copied. -local.server.dir=/Users/tomek/jboss/jboss-clean/ - -# Path to where your portal extensions are to be deployed - you shouldn't -# have to change that. -local.deploy.dir=${local.server.dir}/server/default/deploy - -# Path to your local maven repository - you can comment this out if you use -# the default location. You can also create a build.properties in your home -# directory to set the maven.repo.local for all projects. -# maven.repo.local= - -# URL of your content repository. You don't have to specify this if you don't -# plan to update the content by maven (it's need for CruiseControl). -maven.scm.url= Deleted: contrib/wikiPortlet/trunk/build.properties.sample =================================================================== --- contrib/wikiPortlet/trunk/build.properties.sample 2009-03-03 20:11:58 UTC (rev 254) +++ contrib/wikiPortlet/trunk/build.properties.sample 2009-03-03 20:17:59 UTC (rev 255) @@ -1,15 +0,0 @@ -# Path to where JBoss AS is to be copied. -local.server.dir= - -# Path to where your portal extensions are to be deployed - you shouldn't -# have to change that. -local.deploy.dir=${local.server.dir}/server/all/deploy - -# Path to your local maven repository - you can comment this out if you use -# the default location. You can also create a build.properties in your home -# directory to set the maven.repo.local for all projects. -# maven.repo.local= - -# URL of your content repository. You don't have to specify this if you don't -# plan to update the content by maven (it's need for CruiseControl). -maven.scm.url= Deleted: contrib/wikiPortlet/trunk/common.xml =================================================================== --- contrib/wikiPortlet/trunk/common.xml 2009-03-03 20:11:58 UTC (rev 254) +++ contrib/wikiPortlet/trunk/common.xml 2009-03-03 20:17:59 UTC (rev 255) @@ -1,51 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> -<project> - <pomVersion>3</pomVersion> - - <dependencies> - <dependency> - <id>portlet-api</id> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>1.0</version> - <jar>jboss-jmx.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - <version>1.0</version> - <jar>jboss-common.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-common-lib</artifactId> - <version>1.0</version> - <jar>portal-common-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-core-lib</artifactId> - <version>1.0</version> - <jar>portal-core-lib.jar</jar> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>portal-portlet-lib</artifactId> - <version>1.0</version> - <jar>portal-portlet-lib.jar</jar> - </dependency> - - </dependencies> - - <build> - <sourceDirectory>src/java</sourceDirectory> - </build> -</project> Deleted: contrib/wikiPortlet/trunk/maven.xml =================================================================== --- contrib/wikiPortlet/trunk/maven.xml 2009-03-03 20:11:58 UTC (rev 254) +++ contrib/wikiPortlet/trunk/maven.xml 2009-03-03 20:17:59 UTC (rev 255) @@ -1,112 +0,0 @@ - -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" xmlns:maven="jelly:maven"> -  - - <goal name="prepare-repo"> - <ant:copy todir="${maven.repo.local}" overwrite="true"> - <ant:fileset dir="binaries" /> - </ant:copy> - </goal> - - <goal name="build"> - <attainGoal name="wiki:build" /> - </goal> - - <goal name="prj-install"> - </goal> - - <goal name="deploy"> - <attainGoal name="wiki:deploy" /> - </goal> - - <goal name="clean"> - <ant:delete dir="target" /> - <ant:delete dir="wiki-common/target" /> - <ant:delete dir="wiki-management/target" /> - <ant:delete dir="forge-wiki/target" /> - <ant:delete dir="wiki-test/target" /> - </goal> - - <goal name="wiki:build"> - <maven:reactor includes="jbosswiki/wiki-common/project.xml" excludes="" basedir="." - banner="Making wiki-common for the repo" - goals="clean,build" ignoreFailures="false" /> - <maven:reactor includes="jbosswiki/wiki-management/project.xml" excludes="" basedir="." - banner="Building and deploying EJB3 service for wiki" - goals="clean,build" ignoreFailures="false" /> - <maven:reactor includes="jbosswiki/forge-wiki/project.xml" excludes="" basedir="." - banner="Building and deploying wiki portlet/servlet" - goals="clean,build" ignoreFailures="false" /> - <maven:reactor includes="jbosswiki/wiki-test/project.xml" excludes="" basedir="." - banner="Building and deploying wiki test" - goals="clean,build" ignoreFailures="false" /> - - <attainGoal name="prepare-ear" /> - - <attainGoal name="ear" /> - </goal> - - <goal name="wiki:localbuild"> - <maven:reactor includes="wiki-common/project.xml" excludes="" basedir="." - banner="Making wiki-common for the repo" - goals="clean,build" ignoreFailures="false" /> - <maven:reactor includes="wiki-management/project.xml" excludes="" basedir="." - banner="Building and deploying EJB3 service for wiki" - goals="clean,build" ignoreFailures="false" /> - <maven:reactor includes="forge-wiki/project.xml" excludes="" basedir="." - banner="Building and deploying wiki portlet/servlet" - goals="clean,build" ignoreFailures="false" /> - <maven:reactor includes="wiki-test/project.xml" excludes="" basedir="." - banner="Building and deploying wiki test" - goals="clean,build" ignoreFailures="false" /> - - <attainGoal name="prepare-ear" /> - - <attainGoal name="ear" /> - </goal> - - <goal name="prepare-ear"> - <ant:delete dir="target/ear" /> - - <ant:copy tofile="target/ear/wiki-common.jar" file="wiki-common/target/wiki-common-1.0.jar" /> - <ant:copy tofile="target/ear/wiki.ejb3" file="wiki-management/target/wiki-management-1.0.jar" /> - <ant:copy tofile="target/ear/wiki.war" file="forge-wiki/target/wiki.war" /> - <ant:copy tofile="target/ear/wiki-test.war" file="wiki-test/target/wiki-test.war" /> - - <ant:copy todir="target/ear"> - <ant:fileset dir="lib"> - <ant:filename name="*.jar" /> - </ant:fileset> - </ant:copy> - </goal> - - <goal name="wiki:deploy"> - <ant:copy - todir="${local.deploy.dir}" - file="target/${maven.final.name}.ear" overwrite="true" /> - </goal> - - <goal name="wiki:all"> - <attainGoal name="prepare-repo" /> - - <attainGoal name="wiki:localbuild" /> - - <attainGoal name="wiki:deploy" /> - </goal> - - <goal name="all"> - <attainGoal name="wiki:all" /> - </goal> - - <goal name="help"> - <echo> - First make file wiki-common/src/etc/org/jboss/wiki/filedatasource.properties (see the .sample file), then run maven all - </echo> - </goal> -</project> Deleted: contrib/wikiPortlet/trunk/project.properties =================================================================== --- contrib/wikiPortlet/trunk/project.properties 2009-03-03 20:11:58 UTC (rev 254) +++ contrib/wikiPortlet/trunk/project.properties 2009-03-03 20:17:59 UTC (rev 255) @@ -1,7 +0,0 @@ -maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ -maven.junit.fork=yes -maven.final.name=wiki - -maven.jar.override=on - -maven.jar.shotoku-base=${ext.root.dir}/shotoku/shotoku-base/target/shotoku-base.jar Deleted: contrib/wikiPortlet/trunk/project.xml =================================================================== --- contrib/wikiPortlet/trunk/project.xml 2009-03-03 20:11:58 UTC (rev 254) +++ contrib/wikiPortlet/trunk/project.xml 2009-03-03 20:17:59 UTC (rev 255) @@ -1,18 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> - -<project> -<pomVersion>3</pomVersion> - <id>jbosswiki</id> - <name>JBoss Wiki</name> - <currentVersion>1.0</currentVersion> - <organization> - <name>Tomasz Szymanski</name> - <url>http://mamut.net.pl</url> - </organization> - <description></description> - -</project>

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r254 - contrib/wikiPortlet/trunk/wiki-test.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-03 15:11:58 -0500 (Tue, 03 Mar 2009) New Revision: 254 Removed: contrib/wikiPortlet/trunk/wiki-test/WEB-INF/ Log:

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r253 - contrib/wikiPortlet/trunk/wiki-test/src/web.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-03 15:11:11 -0500 (Tue, 03 Mar 2009) New Revision: 253 Added: contrib/wikiPortlet/trunk/wiki-test/src/web/META-INF/ Log:

15 years, 1 month

1
0
0 / 0

JBoss PortletSwap SVN: r252 - in contrib/wikiPortlet/trunk: wiki-test and 1 other directory.

by portletswap-commits＠lists.jboss.org

Author: piergiorgiolucidi Date: 2009-03-03 15:10:58 -0500 (Tue, 03 Mar 2009) New Revision: 252 Removed: contrib/wikiPortlet/trunk/assembly.xml contrib/wikiPortlet/trunk/wiki-test/META-INF/ Log: Deleted: contrib/wikiPortlet/trunk/assembly.xml ===================================================================

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

portletswap-commits March 2009