JBoss Portal SVN: r13000 - in tags/JBoss_Portal_2_6_8: server/src/main/org/jboss/portal/server and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-09 10:24:46 -0400 (Mon, 09 Mar 2009)
New Revision: 13000
Modified:
tags/JBoss_Portal_2_6_8/build/build.xml
tags/JBoss_Portal_2_6_8/build/distrib.xml
tags/JBoss_Portal_2_6_8/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
JBoss Portal 2.6.8
Modified: tags/JBoss_Portal_2_6_8/build/build.xml
===================================================================
--- tags/JBoss_Portal_2_6_8/build/build.xml 2009-03-09 14:17:15 UTC (rev 12999)
+++ tags/JBoss_Portal_2_6_8/build/build.xml 2009-03-09 14:24:46 UTC (rev 13000)
@@ -61,8 +61,8 @@
<property name="version.major" value="2"/>
<property name="version.minor" value="6"/>
- <property name="version.revision" value="9"/>
- <property name="version.tag" value="SNAPSHOT"/>
+ <property name="version.revision" value="8"/>
+ <property name="version.tag" value="GA"/>
<property name="version.name" value="Ninja"/>
<!-- This must be set to the CVS tag for any release -->
Modified: tags/JBoss_Portal_2_6_8/build/distrib.xml
===================================================================
--- tags/JBoss_Portal_2_6_8/build/distrib.xml 2009-03-09 14:17:15 UTC (rev 12999)
+++ tags/JBoss_Portal_2_6_8/build/distrib.xml 2009-03-09 14:24:46 UTC (rev 13000)
@@ -2,7 +2,7 @@
<property name="source.dir" value="../../jboss-portal-2.6"/>
<property name="docs.dir" value="${source.dir}-docs"/>
- <property name="release.version" value="2.6.9.SNAPSHOT"/>
+ <property name="release.version" value="2.6.8.GA"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
Modified: tags/JBoss_Portal_2_6_8/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- tags/JBoss_Portal_2_6_8/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-03-09 14:17:15 UTC (rev 12999)
+++ tags/JBoss_Portal_2_6_8/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-03-09 14:24:46 UTC (rev 13000)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 6, 9, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Ninja");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 6, 8, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
17 years, 1 month
JBoss Portal SVN: r12999 - tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-09 10:17:15 -0400 (Mon, 09 Mar 2009)
New Revision: 12999
Added:
tags/JBoss_Portal_2_6_8/
Log:
Tagging JBoss Portal 2.6.8
Copied: tags/JBoss_Portal_2_6_8 (from rev 12998, branches/JBoss_Portal_Branch_2_6)
17 years, 1 month
JBoss Portal SVN: r12998 - in branches/JBoss_Portal_Branch_2_6: server/src/main/org/jboss/portal/server and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-09 08:46:27 -0400 (Mon, 09 Mar 2009)
New Revision: 12998
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_6/build/build.xml
branches/JBoss_Portal_Branch_2_6/build/distrib.xml
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
Preparing 2.6.8/2.6.9.SNAPSHOT
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2009-03-09 04:58:44 UTC (rev 12997)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2009-03-09 12:46:27 UTC (rev 12998)
@@ -51,7 +51,7 @@
<componentref name="jboss-portal/modules/web" version="1.1.0"/>
<componentref name="jboss-portal/modules/test" version="1.0.1.SP2"/>
<componentref name="jboss-portal/modules/portlet" version="1.0.3"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.5"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0.8"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.1.1"/>
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2009-03-09 04:58:44 UTC (rev 12997)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2009-03-09 12:46:27 UTC (rev 12998)
@@ -61,8 +61,8 @@
<property name="version.major" value="2"/>
<property name="version.minor" value="6"/>
- <property name="version.revision" value="5"/>
- <property name="version.tag" value="GA"/>
+ <property name="version.revision" value="9"/>
+ <property name="version.tag" value="SNAPSHOT"/>
<property name="version.name" value="Ninja"/>
<!-- This must be set to the CVS tag for any release -->
Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2009-03-09 04:58:44 UTC (rev 12997)
+++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2009-03-09 12:46:27 UTC (rev 12998)
@@ -2,7 +2,7 @@
<property name="source.dir" value="../../jboss-portal-2.6"/>
<property name="docs.dir" value="${source.dir}-docs"/>
- <property name="release.version" value="2.6.5.GA"/>
+ <property name="release.version" value="2.6.9.SNAPSHOT"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-03-09 04:58:44 UTC (rev 12997)
+++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2009-03-09 12:46:27 UTC (rev 12998)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 6, 7, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Ninja");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 6, 9, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Ninja");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
17 years, 1 month
JBoss Portal SVN: r12997 - in branches/JBoss_Portal_AS5_Deployer/core-cms: src/resources/portal-cms-sar/conf/hibernate/cms and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-03-09 00:58:44 -0400 (Mon, 09 Mar 2009)
New Revision: 12997
Modified:
branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml
branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
Log:
Minor dependency changes for better compatiblity with AS5.
Update hibernate configuration for workflow to temporarily disable second level cache.
Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml 2009-03-09 04:58:42 UTC (rev 12996)
+++ branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml 2009-03-09 04:58:44 UTC (rev 12997)
@@ -266,7 +266,8 @@
<!-- miscellaneous thirdparty dep -->
<fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
- <fileset dir="${apache.ant.lib}" includes="ant.jar"/>
+
+ <fileset dir="${apache.ant.lib}"/>
<fileset dir="${slf4j.slf4j.lib}"/>
</copy>
Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2009-03-09 04:58:42 UTC (rev 12996)
+++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2009-03-09 04:58:44 UTC (rev 12997)
@@ -31,8 +31,8 @@
<property name="show_sql">@portal.sql.show@</property>
<!-- caching properties -->
- <property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
+ <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_query_cache">false</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@@ -62,4 +62,4 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/cms/domain.hbm.xml"/>
</session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
17 years, 1 month
JBoss Portal SVN: r12996 - branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-03-09 00:58:42 -0400 (Mon, 09 Mar 2009)
New Revision: 12996
Modified:
branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml
Log:
Minor dependency changes for better compatiblity with AS5.
Update hibernate configuration for workflow to temporarily disable second level cache.
Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml 2009-03-09 04:58:40 UTC (rev 12995)
+++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml 2009-03-09 04:58:42 UTC (rev 12996)
@@ -21,6 +21,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
<deployments>
<deployment>
@@ -37,4 +40,4 @@
</security-constraint>
</instance>
</deployment>
-</deployments>
\ No newline at end of file
+</deployments>
17 years, 1 month
JBoss Portal SVN: r12995 - branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-03-09 00:58:40 -0400 (Mon, 09 Mar 2009)
New Revision: 12995
Modified:
branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
Log:
Minor dependency changes for better compatiblity with AS5.
Update hibernate configuration for workflow to temporarily disable second level cache.
Modified: branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2009-03-09 04:58:37 UTC (rev 12994)
+++ branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2009-03-09 04:58:40 UTC (rev 12995)
@@ -21,7 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<metadata tag="transaction" class="org.jboss.portal.wsrp.consumer.ConsumerRegistryService">
<method name="startService">
<trans-attribute>Required</trans-attribute>
@@ -76,4 +76,4 @@
<bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))">
<interceptor-ref name="instance-txsynchronized"/>
</bind>
-</aop>
\ No newline at end of file
+</aop>
17 years, 1 month
JBoss Portal SVN: r12994 - branches/JBoss_Portal_AS5_Deployer/build.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-03-09 00:58:37 -0400 (Mon, 09 Mar 2009)
New Revision: 12994
Modified:
branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
Log:
Minor dependency changes for better compatiblity with AS5.
Update hibernate configuration for workflow to temporarily disable second level cache.
Modified: branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-09 04:53:58 UTC (rev 12993)
+++ branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-09 04:58:37 UTC (rev 12994)
@@ -129,7 +129,7 @@
<componentref name="qdox" version="1.6.1-brew"/>
<componentref name="trove" version="1.0.2-brew"/>
<componentref name="sleepycat" version="3.0.12"/>
- <componentref name="slf4j" version="1.3.0"/>
+ <componentref name="slf4j" version="1.5.6"/>
<componentref name="stax-api" version="1.0"/>
<componentref name="glassfish/jaf" version="1.1.0-brew"/>
<componentref name="sun-javacc" version="3.2-brew"/>
17 years, 1 month
JBoss Portal SVN: r12993 - modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-03-09 00:53:58 -0400 (Mon, 09 Mar 2009)
New Revision: 12993
Modified:
modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java
modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java
modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java
Log:
Fix the order of deployment for the service injector deployer.
Fix the tld deployer to name the tld to the proper file name.
Modified: modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java 2009-03-09 04:50:55 UTC (rev 12992)
+++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java 2009-03-09 04:53:58 UTC (rev 12993)
@@ -56,6 +56,7 @@
addInput(WebAppContextDeployer.PORTLET_APP_CONTEXT_PATH_ATTACHMENT);
addInput(WebAppContextDeployer.PORTLET_APP_SERVLET_CONTEXT_ATTACHMENT);
addInput(WebApplication.class);
+ addInput(ServiceInjectorDeployer.SERVICES_INJECTED);
addOutput(PORLET_DEPLOYED);
setStage(DeploymentStages.INSTALLED);
}
Modified: modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java 2009-03-09 04:50:55 UTC (rev 12992)
+++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java 2009-03-09 04:53:58 UTC (rev 12993)
@@ -93,11 +93,11 @@
PortletApplication10MetaData metaData = unit.getAttachment(PortletApplication10MetaData.class);
if (metaData instanceof PortletApplication20MetaData)
{
- copyTld(tldDirectory + "/portlet_2_0.tld", docBase);
+ copyTld(tldDirectory + "/portlet_2_0.tld", "portlet_2_0.tld", docBase);
}
else
{
- copyTld(tldDirectory + "/portlet.tld", docBase);
+ copyTld(tldDirectory + "/portlet.tld", "portlet.tld", docBase);
}
}
catch (Exception e)
@@ -106,7 +106,7 @@
}
}
- protected void copyTld(String tldFileLocation, String webappDirectoryLocation) throws IOException
+ protected void copyTld(String tldFileLocation, String tldName, String webappDirectoryLocation) throws IOException
{
//the tld file will be copied to the web-inf directory of the webapp.
File webappWebInfFile = new File(webappDirectoryLocation + "/WEB-INF");
@@ -121,7 +121,7 @@
else if (webappWebInfFile.isDirectory())
{
InputStream fileInput = Thread.currentThread().getContextClassLoader().getResourceAsStream(tldFileLocation);
- FileOutputStream fileOutput = new FileOutputStream(new File(webappWebInfFile, "portlet.tld"));
+ FileOutputStream fileOutput = new FileOutputStream(new File(webappWebInfFile, tldName));
int in = fileInput.read();
while (in > 0)
Modified: modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java 2009-03-09 04:50:55 UTC (rev 12992)
+++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java 2009-03-09 04:53:58 UTC (rev 12993)
@@ -45,6 +45,8 @@
public class ServiceInjectorDeployer extends AbstractDeployer
{
+ public static final String SERVICES_INJECTED = "services.injected";
+
protected MBeanServer mbeanServer;
protected String serverDomain = "portal";
@@ -63,6 +65,7 @@
this.setAllInputs(false);
this.setInput(JBossPortletAppMetaData.class);
this.addInput(WebAppContextDeployer.PORTLET_APP_SERVLET_CONTEXT_ATTACHMENT);
+ this.addOutput(SERVICES_INJECTED);
this.setStage(DeploymentStages.INSTALLED);
}
@@ -79,6 +82,7 @@
}
}
+ unit.addAttachment(SERVICES_INJECTED, "services injected");
}
public void injectService (ServiceMetaData serviceMetaData ,ServletContext servletContext, ClassLoader classloader)
17 years, 1 month
JBoss Portal SVN: r12992 - in modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object: adapter and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-03-09 00:50:55 -0400 (Mon, 09 Mar 2009)
New Revision: 12992
Added:
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java
Modified:
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java
Log:
Add adapter to 'supported-locale' to properly return a Locale object.
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-07 00:29:06 UTC (rev 12991)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-09 04:50:55 UTC (rev 12992)
@@ -26,8 +26,10 @@
import java.util.Locale;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+import org.jboss.portal.metadata.portal.object.adapter.LocaleAdapter;
import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData;
@@ -98,6 +100,7 @@
}
@XmlElement(name = "supported-locale")
+ @XmlJavaTypeAdapter (LocaleAdapter.class)
public void setSupportedLocales(List<Locale> supportedLocales)
{
this.supportedLocales = supportedLocales;
@@ -107,8 +110,7 @@
{
return supportedLocales;
}
-
- //abstract public void setChildren(List<?> children);
+
abstract public List<CommonPortalObject> getChildren();
@XmlElement(name = "security-constraint")
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-07 00:29:06 UTC (rev 12991)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-09 04:50:55 UTC (rev 12992)
@@ -49,8 +49,6 @@
protected String resourceBundle;
- protected List<String> supportedLocales;
-
protected CoordinationMetaData coordination;
Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java (rev 0)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java 2009-03-09 04:50:55 UTC (rev 12992)
@@ -0,0 +1,74 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.metadata.portal.object.adapter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.naming.OperationNotSupportedException;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public final class LocaleAdapter extends XmlAdapter<String, Locale>
+{
+
+ @Override
+ public String marshal(Locale locale) throws Exception
+ {
+ throw new OperationNotSupportedException();
+ }
+
+ @Override
+ public Locale unmarshal(String localeString) throws Exception
+ {
+ return new Locale(localeString);
+ }
+
+}
+
+//public final class LocaleAdapter extends XmlAdapter<List<String>, List<Locale>>
+//{
+//
+// @Override
+// public List<String> marshal(List<Locale> locales) throws Exception
+// {
+// throw new OperationNotSupportedException();
+// }
+//
+// @Override
+// public List<Locale> unmarshal(List<String> localeStrings) throws Exception
+// {
+// List<Locale> locales = new ArrayList<Locale>(localeStrings.size());
+// for (String localeString : localeStrings)
+// {
+// locales.add(new Locale(localeString));
+// }
+//
+// return locales;
+// }
+//
+//}
17 years, 1 month
JBoss Portal SVN: r12991 - in tags/JBoss_Portal_2_7_2: theme/src/bin/portal-ajax-war/dyna and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-03-06 19:29:06 -0500 (Fri, 06 Mar 2009)
New Revision: 12991
Modified:
tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java
tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/dyna.js
tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/prototype.js
Log:
- JBPORTAL-2336: update from trunk, only downside is that it requires patching prototype...
Modified: tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java
===================================================================
--- tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java 2009-03-07 00:09:26 UTC (rev 12990)
+++ tags/JBoss_Portal_2_7_2/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java 2009-03-07 00:29:06 UTC (rev 12991)
@@ -44,8 +44,7 @@
{
String name = req.getParameter("name");
String value = req.getParameter("value");
- String scope = req.getParameter("scope");
- boolean portletScope = "portlet".equals(scope);
+ boolean portletScope = req.getParameter("portlet") != null;
if (name != null && value != null)
{
req.getPortletSession().setAttribute(name, value, portletScope ? PortletSession.PORTLET_SCOPE : PortletSession.APPLICATION_SCOPE);
@@ -86,19 +85,19 @@
}
//
- writer.println("<script type='text/javascript'>\n" +
- "function processForm(value) {" +
- "var form = document.getElementById('sessionForm');\n" +
- "var hidden = document.getElementById('sessionHidden');\n" +
- "hidden.value = value;\n" +
- "form.submit();}\n" +
- "</script>");
+// writer.println("<script type='text/javascript'>\n" +
+// "function processForm(value) {" +
+// "var form = document.getElementById('sessionForm');\n" +
+// "var hidden = document.getElementById('sessionHidden');\n" +
+// "hidden.value = value;\n" +
+// "form.submit();}\n" +
+// "</script>");
writer.println("<form id='sessionForm' action=\"" + purl.toString() + "\" method=\"post\">");
writer.println("<input type=\"text\" name=\"name\"/>");
writer.println("<input type=\"text\" name=\"value\"/>");
- writer.println("<input type=\"button\" name=\"portlet\" value=\"Add to portlet scope\" onclick=\"processForm('portlet')\"/>");
- writer.println("<input type=\"button\" name=\"application\" value=\"Add to application scope\" onclick=\"processForm('application')\"/>");
- writer.println("<input id='sessionHidden' name='scope' type='hidden'/>");
+ writer.println("<input type=\"submit\" name=\"portlet\" value=\"Add to portlet scope\" />");
+ writer.println("<input type=\"submit\" name=\"application\" value=\"Add to application scope\" />");
+ // writer.println("<input id='sessionHidden' name='scope' type='hidden'/>");
writer.println("</form><br/>");
//
Modified: tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/dyna.js
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-03-07 00:09:26 UTC (rev 12990)
+++ tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-03-07 00:29:06 UTC (rev 12991)
@@ -21,6 +21,8 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+var currentSubmit;
+
function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId)
{
var options = {
@@ -41,7 +43,7 @@
onLoading: function(t)
{
}
- }
+ };
new Ajax.Request(server_base_url + "/ajax", options);
}
@@ -106,6 +108,11 @@
var source = Event.element(event);
var container = Element.up(source, "div.dyna-window");
+ //attach onclick observer to all submit buttons
+ $$('input[type=submit]').invoke('observe', 'click', function(e) {
+ currentSubmit = e.findElement();
+ });
+
// We found the window
if (container != null)
{
@@ -158,7 +165,6 @@
// Check we can handle this URL
if (isURLAccepted(current.action))
{
-
// Set URL
url = current.action;
@@ -166,7 +172,7 @@
options.enctype = enctype;
options.asynchronous = false;
options.method = "post"
- options.postBody = Form.serialize(current);
+ options.postBody = Form.serialize(current,'',currentSubmit);
}
}
}
Modified: tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/prototype.js
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/prototype.js 2009-03-07 00:09:26 UTC (rev 12990)
+++ tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/prototype.js 2009-03-07 00:29:06 UTC (rev 12991)
@@ -2609,7 +2609,9 @@
"FORM": Object.clone(Form.Methods),
"INPUT": Object.clone(Form.Element.Methods),
"SELECT": Object.clone(Form.Element.Methods),
- "TEXTAREA": Object.clone(Form.Element.Methods)
+ "TEXTAREA": Object.clone(Form.Element.Methods),
+ //[SERIALIZE_ERROR]
+ "BUTTON": Object.clone(Form.Element.Methods)
});
}
@@ -3475,8 +3477,21 @@
};
Form.Methods = {
- serialize: function(form, options) {
- return Form.serializeElements(Form.getElements(form), options);
+ serialize: function(form, options, buttonPressed) {
+ //[SERIALIZE_ERROR] Implements additional functionality to support <button> and ensure other button-type
+ // <inputs> are not serialized
+ var elements = Form.getElements(form);
+ if (buttonPressed) {
+ elements = elements.findAll(
+ function(element) {
+ return element == $(buttonPressed) ||
+ (element.tagName.toLowerCase() != "button" &&
+ (element.tagName.toLowerCase() != "input" ||
+ (element.type != "submit" && element.type != "button" && element.type != "image" && element.type != "reset")));
+ }
+ );
+ };
+ return Form.serializeElements(elements, options);
},
getElements: function(form) {
@@ -3657,6 +3672,11 @@
else element.value = value;
},
+ //[SERIALIZE_ERROR]
+ button: function(element) {
+ return element.value;
+ },
+
select: function(element, value) {
if (Object.isUndefined(value))
return this[element.type == 'select-one' ?
17 years, 1 month