[portal-commits] JBoss Portal SVN: r9730 - in modules/portlet/tags/JBP_PORTLET_1_0_2: .settings and 2 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-02-04 05:14:08 -0500 (Mon, 04 Feb 2008) New Revision: 9730 Added: modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties Removed: modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java Log: Fixing build and version number Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath =================================================================== --- modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath 2008-02-04 08:47:23 UTC (rev 9729) +++ modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath 2008-02-04 10:14:08 UTC (rev 9730) @@ -22,5 +22,6 @@ <classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/> + <classpathentry kind="lib" path="thirdparty/tagsoup/lib/tagsoup.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Deleted: modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs =================================================================== --- modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs 2008-02-04 08:47:23 UTC (rev 9729) +++ modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs 2008-02-04 10:14:08 UTC (rev 9730) @@ -1,12 +0,0 @@ -#Wed Sep 12 11:19:13 CEST 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -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=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 Added: modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs 2008-02-04 10:14:08 UTC (rev 9730) @@ -0,0 +1,3 @@ +#Mon Feb 04 10:02:33 CET 2008 +eclipse.preferences.version=1 +internal.default.compliance=default Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml =================================================================== --- modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml 2008-02-04 08:47:23 UTC (rev 9729) +++ modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml 2008-02-04 10:14:08 UTC (rev 9730) @@ -47,8 +47,8 @@ --> <componentref name="jboss-portal/modules/common" version="1.1.0"/> - <componentref name="jboss-portal/modules/web" version="trunk-SNAPSHOT"/> - <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/> + <componentref name="jboss-portal/modules/web" version="1.1.0"/> + <componentref name="jboss-portal/modules/test" version="1.0.1"/> <componentref name="sun-servlet" version="2.4"/> <componentref name="sun-jaf" version="1.1"/> Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml =================================================================== --- modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml 2008-02-04 08:47:23 UTC (rev 9729) +++ modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml 2008-02-04 10:14:08 UTC (rev 9730) @@ -61,7 +61,7 @@ <property name="version.major" value="1"/> <property name="version.minor" value="0"/> - <property name="version.revision" value="0"/> + <property name="version.revision" value="2"/> <property name="version.tag" value="GA"/> <property name="version.name" value=""/> Added: modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties =================================================================== --- modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties (rev 0) +++ modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties 2008-02-04 10:14:08 UTC (rev 9730) @@ -0,0 +1,48 @@ +### ====================================================================== ### +## ## +## Local project properties. ## +## ## +## Define properties that are local to your environment here. This ## +## file (local.properties) should not be checked in. Modify the ## +## example to affect all users. ## +## ## +### ====================================================================== ### + +### General compiler configuration ### + +#build.compiler=jikes +#build.warnings=true +#build.pedantic=true +#javac.depend=on + +### Javac/Jikes compiler configuration ### + +javac.optimize=off +javac.debug=on +javac.deprecation=on + +### Enable verbose build output ### + +#init.verbose=true + +### JavaDoc ### +#docs-javadocs.disable=true + +### Do we build xdoclet or get it from thirdparty ### +### uncomment for thirdparty: comment to use xdoclet module. +### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml +#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet + +# Portal database, for now : hsqldb, mysql, postgresql are the possible values +portal.database=mysql +# The datasource name used in the JNDI binding +portal.datasource.name=PortalDS +# Context root for the portal main servlet +portal.web.context-root=/portal +# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default +portal.deploy.dir=default/deploy +portal-ha.deploy.dir=all/deploy +# Show SQL or not +portal.sql.show=false +# Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable +#jboss.home= Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-04 08:47:23 UTC (rev 9729) +++ modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-04 10:14:08 UTC (rev 9730) @@ -45,7 +45,9 @@ import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; import org.jboss.beans.metadata.plugins.ThisValueMetaData; +import org.jboss.beans.metadata.spi.InstallMetaData; import org.jboss.beans.metadata.spi.ParameterMetaData; +import org.jboss.beans.metadata.spi.PropertyMetaData; import org.apache.log4j.Logger; import javax.servlet.ServletContext; @@ -53,6 +55,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.Collections; +import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -110,23 +113,23 @@ bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop")); - bmd.setProperties(Collections.singleton(new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id)))); + bmd.setProperties(Collections.singleton((PropertyMetaData)new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id)))); AbstractInstallMetaData deployerinstallmd = new AbstractInstallMetaData(); deployerinstallmd.setBean("PortletApplicationDeployer"); - deployerinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + deployerinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); deployerinstallmd.setMethodName("installPortletContainer"); AbstractInstallMetaData applicationinstallmd = new AbstractInstallMetaData(); applicationinstallmd.setBean(id); - applicationinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + applicationinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); applicationinstallmd.setMethodName("addContainer"); bmd.setInstalls((List)CollectionBuilder.arrayList().add(deployerinstallmd).add(applicationinstallmd).get()); AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData(); deployeruninstallmd.setBean("PortletApplicationDeployer"); - deployeruninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + deployeruninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); deployeruninstallmd.setMethodName("uninstallPortletContainer"); AbstractInstallMetaData applicationuninstallmd = new AbstractInstallMetaData(); applicationuninstallmd.setBean(id); - applicationuninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + applicationuninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); applicationuninstallmd.setMethodName("removeContainer"); bmd.setUninstalls((List)CollectionBuilder.arrayList().add(deployeruninstallmd).add(applicationuninstallmd).get()); try @@ -155,14 +158,14 @@ bmd.setStop(new AbstractLifecycleMetaData("stop")); AbstractInstallMetaData installmd = new AbstractInstallMetaData(); installmd.setBean("PortletApplicationDeployer"); - installmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + installmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); installmd.setMethodName("installPortletApplication"); - bmd.setInstalls(Collections.singletonList(installmd)); + bmd.setInstalls(Collections.singletonList((InstallMetaData)installmd)); AbstractInstallMetaData uninstallmd = new AbstractInstallMetaData(); uninstallmd.setBean("PortletApplicationDeployer"); - uninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + uninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); uninstallmd.setMethodName("uninstallPortletApplication"); - bmd.setUninstalls(Collections.singletonList(uninstallmd)); + bmd.setUninstalls(Collections.singletonList((InstallMetaData)uninstallmd)); // try