[portletswap-commits] JBoss PortletSwap SVN: r262 - in contrib/wikiPortlet/trunk: forge-wiki and 7 other directories.

Author: piergiorgiolucidi Date: 2009-07-04 09:52:56 -0400 (Sat, 04 Jul 2009) New Revision: 262 Modified: contrib/wikiPortlet/trunk/forge-wiki/pom.xml contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java contrib/wikiPortlet/trunk/forge-wiki/src/web/WEB-INF/portlet.xml contrib/wikiPortlet/trunk/pom.xml contrib/wikiPortlet/trunk/wiki-common/pom.xml contrib/wikiPortlet/trunk/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java contrib/wikiPortlet/trunk/wiki-ear/pom.xml contrib/wikiPortlet/trunk/wiki-management/pom.xml contrib/wikiPortlet/trunk/wiki-test/pom.xml Log: - added bugfix to solve a problem for upload feature - added a refactor for maven poms: now all the dependencies are taken from public repositories: only portal-api-lib and jboss-portlet-api-lib you must install in your local maven repo. Modified: contrib/wikiPortlet/trunk/forge-wiki/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-03-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/forge-wiki/pom.xml 2009-07-04 13:52:56 UTC (rev 262) @@ -1,16 +1,6 @@ <!-- 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 --> @@ -20,7 +10,7 @@ <parent> <groupId>jboss</groupId> - <artifactId>wiki-common</artifactId> + <artifactId>wiki</artifactId> <version>1.0</version> </parent> <artifactId>forge-wiki</artifactId> @@ -70,11 +60,10 @@ <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> - <webappDirectory>${basedir}/src/web/</webappDirectory> + + <webappDirectory>${basedir}/target/webapp/</webappDirectory> <warSourceDirectory>${basedir}/src/web/</warSourceDirectory> <warSourceExcludes>WEB-INF/lib/*.jar,**/.svn,.svn/**/*,**/.svn/**,**/.DS_Store</warSourceExcludes> - <warName>wiki</warName> - <outputDirectory>target/wiki.ear</outputDirectory> </configuration> </plugin> <plugin> @@ -87,34 +76,20 @@ </plugins> </build> <dependencies> + <dependency> <groupId>jboss</groupId> - <artifactId>activation</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</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> + <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>2.0</version> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> </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-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2009-07-04 13:52:56 UTC (rev 262) @@ -38,6 +38,8 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.PortletDiskFileUpload; +import org.apache.commons.fileupload.PortletFileUpload; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.jboss.logging.Logger; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; @@ -81,7 +83,7 @@ } } - private Map<String, String> convertParameters(ActionRequest rReq) { + private Map<String, String> convertParameters(JBossActionRequest rReq) { Map<String, String> convertedParameters = new HashMap<String, String>(); Map paramMap = rReq.getParameterMap(); @@ -115,17 +117,16 @@ WikiContext wikiContext = null; if (PortletDiskFileUpload.isMultipartContent(rReq)) { - PortletDiskFileUpload dfu = new PortletDiskFileUpload(); + + DiskFileItemFactory factory = new DiskFileItemFactory(); + PortletFileUpload upload = new PortletFileUpload(factory); // maximum allowed file upload size (10 MB) - dfu.setSizeMax(10 * 1000 * 1000); + upload.setSizeMax(10 * 1000 * 1000); - // maximum size in memory (vs disk) (100 KB) - dfu.setSizeThreshold(100 * 1000); - try { // get the FileItems - List fileItems = dfu.parseRequest(rReq); + List fileItems = upload.parseRequest((ActionRequest)rReq); Iterator iter = fileItems.iterator(); while (iter.hasNext()) { FileItem item = (FileItem) iter.next(); Modified: contrib/wikiPortlet/trunk/forge-wiki/src/web/WEB-INF/portlet.xml =================================================================== --- contrib/wikiPortlet/trunk/forge-wiki/src/web/WEB-INF/portlet.xml 2009-03-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/forge-wiki/src/web/WEB-INF/portlet.xml 2009-07-04 13:52:56 UTC (rev 262) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" - version="2.0"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> + <portlet> <portlet-name>WikiPortlet</portlet-name> Modified: contrib/wikiPortlet/trunk/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/pom.xml 2009-03-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/pom.xml 2009-07-04 13:52:56 UTC (rev 262) @@ -2,17 +2,19 @@ <!-- 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 + To build this project you need to have manually installed + in your local Maven repo 2 libraries from jboss-portal.sar/lib: + portal-api-lib.jar + jboss-portlet-api-lib.jar + + You can execute these Maven commands to install these in your local repo + from jboss-portal.sar/lib directory: + + mvn install:install-file -DgroupId=jboss -DartifactId=portal-api-lib -Dversion=2.7.1 -Dpackaging=jar -Dfile=%PORTAL_HOME%\jboss-portal.sar\lib\portal-api-lib.jar + + mvn install:install-file -DgroupId=jboss -DartifactId=jboss-portlet-api-lib -Dversion=1.0 -Dpackagin g=jar -Dfile=%PORTAL_HOME%\jboss-portal.sar\lib\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" @@ -25,6 +27,25 @@ <module>wiki-test</module> <module>wiki-ear</module> </modules> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + <repositories> + <repository> + <id>jboss-repository-mirror</id> + <name>jboss-repository</name> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>Public-maven2-mirror</id> + <name>Maven 2 Repo</name> + <url>http://repo1.maven.org/maven2/</url> + </repository> + </repositories> + <groupId>jboss</groupId> <artifactId>wiki</artifactId> <version>1.0</version> @@ -54,54 +75,42 @@ </build> <dependencies> <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>jboss</groupId> <artifactId>jboss-jmx</artifactId> - <version>1.0</version> + <version>4.2.3.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-common</artifactId> - <version>1.0</version> + <version>4.2.3.GA</version> <scope>provided</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>portal-common-lib</artifactId> - <version>1.0</version> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-portal</artifactId> + <version>1.2.4</version> <scope>provided</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>portal-core-lib</artifactId> - <version>1.0</version> + <groupId>org.jboss.portal.core</groupId> + <artifactId>core</artifactId> + <version>2.7.1.GA</version> <scope>provided</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>portal-portlet-lib</artifactId> - <version>1.0</version> + <groupId>org.jboss.portal.identity</groupId> + <artifactId>identity-identity</artifactId> + <version>1.0.7</version> <scope>provided</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>portal-identity-lib</artifactId> - <version>2.7.1</version> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-portlet</artifactId> + <version>2.0.7</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>javax.transaction</groupId> <artifactId>jta</artifactId> <version>1.1</version> @@ -120,12 +129,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-mail</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.jms</groupId> <artifactId>jms</artifactId> <version>1.1</version> @@ -134,44 +137,72 @@ <dependency> <groupId>jboss</groupId> <artifactId>jboss-ejb3</artifactId> - <version>1.0</version> + <version>4.2.3.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-ejb3x</artifactId> - <version>1.0</version> + <version>4.2.3.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-annotations-ejb3</artifactId> - <version>1.0</version> + <version>4.2.3.GA</version> <scope>provided</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> <version>1.2.1</version> <scope>provided</scope> </dependency> + + <!-- + The following POMs must be installed manually on your local Maven + repository + --> + <dependency> <groupId>jboss</groupId> - <artifactId>activation</artifactId> + <artifactId>jboss-portlet-api-lib</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> - <scope>provided</scope> - </dependency> + </dependencies> </project> Modified: contrib/wikiPortlet/trunk/wiki-common/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-03-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/wiki-common/pom.xml 2009-07-04 13:52:56 UTC (rev 262) @@ -1,19 +1,10 @@ -<!-- - 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. + + 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> @@ -26,6 +17,7 @@ <name>JBoss Wiki Common</name> <version>1.0</version> <packaging>jar</packaging> + <developers> <developer> <name>Tomasz Szymanski</name> @@ -54,7 +46,6 @@ <include>**/*.txt</include> <include>**/*.xml</include> </includes> - <targetPath>../../../target/wiki.ear</targetPath> </resource> <resource> <directory>src/etc/images</directory> @@ -64,15 +55,15 @@ <include>**/*.png</include> <include>**/*.css</include> </includes> - <targetPath>/images/</targetPath> + <targetPath>images</targetPath> </resource> <resource> - <directory>src/etc/</directory> + <directory>src/etc</directory> <excludes> - <exclude>**/.svn</exclude> - <exclude>**/.svn/**</exclude> - <exclude>**/.DS_Store</exclude> - <exclude>.svn/**/*</exclude> + <exclude>**/.svn</exclude> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> </excludes> <includes> <include>**/*.properties</include> @@ -80,7 +71,6 @@ <include>**/*.types</include> <include>**/*.dtd</include> </includes> - <targetPath>/</targetPath> </resource> </resources> <plugins> @@ -92,29 +82,29 @@ </configuration> </plugin> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <configuration> - <excludes> + <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> - <manifest> - <addClasspath>true</addClasspath> - <addExtensions>true</addExtensions> - </manifest> - <manifestEntries> - <mode>development</mode> - <url>${pom.url}</url> - </manifestEntries> - </archive> - </configuration> - </plugin> + <exclude>**/.svn/**</exclude> + <exclude>**/.DS_Store</exclude> + <exclude>.svn/**/*</exclude> + </excludes> + <finalName>wiki-common</finalName> + <!-- <outputDirectory>../target/wiki.ear/lib</outputDirectory> --> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <addExtensions>true</addExtensions> + </manifest> + <manifestEntries> + <mode>development</mode> + <url>${pom.url}</url> + </manifestEntries> + </archive> + </configuration> + </plugin> </plugins> </build> <dependencies> @@ -130,10 +120,11 @@ <version>1.0</version> <scope>provided</scope> </dependency> + <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.client</groupId> <artifactId>jbossall-client</artifactId> - <version>3.2.3</version> + <version>4.2.3.GA</version> <scope>provided</scope> </dependency> </dependencies> Modified: contrib/wikiPortlet/trunk/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java =================================================================== --- contrib/wikiPortlet/trunk/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java 2009-03-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java 2009-07-04 13:52:56 UTC (rev 262) @@ -8,7 +8,6 @@ import javax.xml.parsers.ParserConfigurationException; import org.jboss.logging.Logger; -import org.jboss.wiki.exceptions.WikiException; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; Modified: contrib/wikiPortlet/trunk/wiki-ear/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-ear/pom.xml 2009-03-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/wiki-ear/pom.xml 2009-07-04 13:52:56 UTC (rev 262) @@ -1,3 +1,28 @@ + <!-- + JBoss, the OpenSource J2EE webOS Distributable under LGPL license. See + terms of license at gnu.org. + + To build this project you need to have manually installed + in your local Maven repo 2 libraries from jboss-portal.sar/lib: + + portal-api-lib.jar + jboss-portlet-api-lib.jar + + You can execute these Maven commands to install these in your local repo from jboss-portal.sar/lib directory: + + + mvn install:install-file -DgroupId=jboss -DartifactId=portal-api-lib -Dversion=2.7.1 -Dpackaging=jar + -Dfile=%PORTAL_HOME%\jboss-portal.sar\lib\portal-api-lib.jar + + + + mvn install:install-file -DgroupId=jboss -DartifactId=jboss-portlet-api-lib -Dversion=1.0 -Dpackagin +g=jar -Dfile=%PORTAL_HOME%\jboss-portal.sar\lib\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> Modified: contrib/wikiPortlet/trunk/wiki-management/pom.xml =================================================================== --- contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-03-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/wiki-management/pom.xml 2009-07-04 13:52:56 UTC (rev 262) @@ -1,19 +1,9 @@ -<!-- - 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. + + 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,8 +71,6 @@ <exclude>**/.DS_Store</exclude> <exclude>.svn/**/*</exclude> </excludes> - <finalName>wiki-management</finalName> - <outputDirectory>../target/wiki.ear</outputDirectory> <archive> <manifest> <addClasspath>true</addClasspath> @@ -104,23 +92,5 @@ <version>1.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-mail</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</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-27 19:42:00 UTC (rev 261) +++ contrib/wikiPortlet/trunk/wiki-test/pom.xml 2009-07-04 13:52:56 UTC (rev 262) @@ -1,16 +1,6 @@ <!-- 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 + terms of license at gnu.org. author: Piergiorgio Lucidi --> @@ -70,8 +60,8 @@ <webappDirectory>${basedir}/src/web/</webappDirectory> <warSourceDirectory>${basedir}/src/web/</warSourceDirectory> <warSourceExcludes>WEB-INF/lib/*.jar,**/.svn,.svn/**/*,**/.svn/**,**/.DS_Store</warSourceExcludes> - <warName>wiki-test</warName> - <outputDirectory>target/wiki.ear</outputDirectory> +<!-- <warName>wiki-test</warName>--> +<!-- <outputDirectory>target/wiki.ear</outputDirectory>--> </configuration> </plugin> <plugin>