JBoss Portal SVN: r7827 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-19 07:18:02 -0400 (Thu, 19 Jul 2007)
New Revision: 7827
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
Log:
Checkboxes are not buttons. (weird display on IE)
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-07-19 09:45:40 UTC (rev 7826)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-07-19 11:18:02 UTC (rev 7827)
@@ -103,7 +103,7 @@
<td>
<c:choose>
<c:when test="#{prop.type == 'java.lang.Boolean'}">
- <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}"
+ <h:selectBooleanCheckbox value="#{prop.value}"
readonly="#{prop.readOnly}"/>
</c:when>
<c:otherwise>
16 years, 10 months
JBoss Portal SVN: r7826 - docs/branches/JBoss_Portal_Branch_2_6/readmeFiles.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-19 05:45:40 -0400 (Thu, 19 Jul 2007)
New Revision: 7826
Modified:
docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/samples-readme.txt
Log:
minor
Modified: docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/samples-readme.txt
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/samples-readme.txt 2007-07-19 09:29:57 UTC (rev 7825)
+++ docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/samples-readme.txt 2007-07-19 09:45:40 UTC (rev 7826)
@@ -1,4 +1,6 @@
Basic samples.
To deploy copy the portal-basic-samples.sar directory in the server/default/deploy directory.
+The sources are available on the download section in the "samples" and "core-samples" directories.
+
16 years, 10 months
JBoss Portal SVN: r7825 - trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-19 05:29:57 -0400 (Thu, 19 Jul 2007)
New Revision: 7825
Modified:
trunk/build/build.xml
Log:
JBPORTAL-1599: Typo in build/build.xml
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-07-19 09:29:31 UTC (rev 7824)
+++ trunk/build/build.xml 2007-07-19 09:29:57 UTC (rev 7825)
@@ -304,7 +304,7 @@
</target>
<target name="undeploy-all"
- description="Deploy all archives."
+ description="Undeploy all archives."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
16 years, 10 months
JBoss Portal SVN: r7824 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-19 05:29:31 -0400 (Thu, 19 Jul 2007)
New Revision: 7824
Modified:
branches/JBoss_Portal_Branch_2_6/build/build.xml
Log:
JBPORTAL-1599: Typo in build/build.xml
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-18 15:51:01 UTC (rev 7823)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-19 09:29:31 UTC (rev 7824)
@@ -287,7 +287,7 @@
</target>
<target name="deploy-all"
- description="Deploy all archives."
+ description="Undeploy all archives."
depends="most">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
16 years, 10 months
JBoss Portal SVN: r7821 - in branches/JBoss_Portal_Branch_2_6/test/src: main/org/jboss/portal/test/framework/embedded and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-07-18 11:38:56 -0400 (Wed, 18 Jul 2007)
New Revision: 7821
Modified:
branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml
branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
Log:
portal to 2.6 the fix of oracle with instance container and the improvement of hibernate support logging from commit #7820 from trunk
Modified: branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml 2007-07-18 15:34:41 UTC (rev 7820)
+++ branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml 2007-07-18 15:38:56 UTC (rev 7821)
@@ -55,6 +55,11 @@
<name>hibernate.dialect</name>
<value>org.hibernate.dialect.Oracle9Dialect</value>
</property>
+ <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
+ <property>
+ <name>hibernate.cache.use_second_level_cache</name>
+ <value>true</value>
+ </property>
</properties>
</configuration>
<!-- The oracle 10g configuration -->
@@ -65,6 +70,11 @@
<name>hibernate.dialect</name>
<value>org.hibernate.dialect.Oracle9Dialect</value>
</property>
+ <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
+ <property>
+ <name>hibernate.cache.use_second_level_cache</name>
+ <value>true</value>
+ </property>
</properties>
</configuration>
<!-- The sqlserver configuration -->
@@ -107,4 +117,4 @@
</property>
</properties>
</configuration>
-</configurations>
\ No newline at end of file
+</configurations>
Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-07-18 15:34:41 UTC (rev 7820)
+++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-07-18 15:38:56 UTC (rev 7821)
@@ -35,6 +35,7 @@
import org.jboss.portal.common.io.IOTools;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
+import org.apache.log4j.Logger;
import javax.transaction.Synchronization;
import java.util.Collection;
@@ -54,6 +55,9 @@
{
/** . */
+ protected Logger log = Logger.getLogger(HibernateSupport.class);
+
+ /** . */
protected String jndiName;
/** . */
@@ -107,29 +111,49 @@
public void setJNDIName(String jndiName)
{
this.jndiName = jndiName;
+
+ //
+ if (jndiName == null)
+ {
+ log = Logger.getLogger(HibernateSupport.class);
+ }
+ else
+ {
+ log = Logger.getLogger(jndiName);
+ }
}
protected void createConfiguration()
{
Configuration cfg = new Configuration();
+ //
for (Iterator i = mappings.iterator(); i.hasNext();)
{
String mapping = (String)i.next();
+ log.debug("Adding mapping " + mapping);
cfg.addResource(mapping, Thread.currentThread().getContextClassLoader());
}
//
Properties props = new Properties();
- props.putAll(config.properties);
+ for (Iterator i = config.properties.entrySet().iterator();i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ String key = (String)entry.getKey();
+ String value = (String)entry.getValue();
+ log.debug("Adding property " + key + " = " + value);
+ cfg.setProperty(key, value);
+ }
cfg.addProperties(props);
- //
+ // todo : make this configurable somehow
cfg.setProperty("hibernate.connection.datasource", "java:/DefaultDS");
//
if (jndiName != null)
{
+ log.debug("Setting jndi name to " + jndiName);
cfg.setProperty("hibernate.session_factory_name", jndiName);
}
16 years, 10 months
JBoss Portal SVN: r7820 - in trunk/test/src: main/org/jboss/portal/test/framework/embedded and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-07-18 11:34:41 -0400 (Wed, 18 Jul 2007)
New Revision: 7820
Modified:
trunk/test/src/etc/hibernates.xml
trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
Log:
- fix instance container test cases with oracle due to a bug described in HBX-146, using caching solve the prb, so it has been enabled only for oracle hibernate settings
- added logging in hibernate support
Modified: trunk/test/src/etc/hibernates.xml
===================================================================
--- trunk/test/src/etc/hibernates.xml 2007-07-18 10:48:17 UTC (rev 7819)
+++ trunk/test/src/etc/hibernates.xml 2007-07-18 15:34:41 UTC (rev 7820)
@@ -55,6 +55,11 @@
<name>hibernate.dialect</name>
<value>org.hibernate.dialect.Oracle9Dialect</value>
</property>
+ <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
+ <property>
+ <name>hibernate.cache.use_second_level_cache</name>
+ <value>true</value>
+ </property>
</properties>
</configuration>
<!-- The oracle 10g configuration -->
@@ -65,6 +70,11 @@
<name>hibernate.dialect</name>
<value>org.hibernate.dialect.Oracle9Dialect</value>
</property>
+ <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case -->
+ <property>
+ <name>hibernate.cache.use_second_level_cache</name>
+ <value>true</value>
+ </property>
</properties>
</configuration>
<!-- The sqlserver configuration -->
@@ -107,4 +117,4 @@
</property>
</properties>
</configuration>
-</configurations>
\ No newline at end of file
+</configurations>
Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-07-18 10:48:17 UTC (rev 7819)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-07-18 15:34:41 UTC (rev 7820)
@@ -35,6 +35,7 @@
import org.jboss.portal.common.io.IOTools;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
+import org.apache.log4j.Logger;
import javax.transaction.Synchronization;
import java.util.Collection;
@@ -54,6 +55,9 @@
{
/** . */
+ protected Logger log = Logger.getLogger(HibernateSupport.class);
+
+ /** . */
protected String jndiName;
/** . */
@@ -107,29 +111,49 @@
public void setJNDIName(String jndiName)
{
this.jndiName = jndiName;
+
+ //
+ if (jndiName == null)
+ {
+ log = Logger.getLogger(HibernateSupport.class);
+ }
+ else
+ {
+ log = Logger.getLogger(jndiName);
+ }
}
protected void createConfiguration()
{
Configuration cfg = new Configuration();
+ //
for (Iterator i = mappings.iterator(); i.hasNext();)
{
String mapping = (String)i.next();
+ log.debug("Adding mapping " + mapping);
cfg.addResource(mapping, Thread.currentThread().getContextClassLoader());
}
//
Properties props = new Properties();
- props.putAll(config.properties);
+ for (Iterator i = config.properties.entrySet().iterator();i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ String key = (String)entry.getKey();
+ String value = (String)entry.getValue();
+ log.debug("Adding property " + key + " = " + value);
+ cfg.setProperty(key, value);
+ }
cfg.addProperties(props);
- //
+ // todo : make this configurable somehow
cfg.setProperty("hibernate.connection.datasource", "java:/DefaultDS");
//
if (jndiName != null)
{
+ log.debug("Setting jndi name to " + jndiName);
cfg.setProperty("hibernate.session_factory_name", jndiName);
}
16 years, 10 months
JBoss Portal SVN: r7819 - in branches/JBoss_Portal_Branch_2_4: core and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-18 06:48:17 -0400 (Wed, 18 Jul 2007)
New Revision: 7819
Modified:
branches/JBoss_Portal_Branch_2_4/cms/build.xml
branches/JBoss_Portal_Branch_2_4/core/build.xml
Log:
Fix build to include upgraded jackrabbit libs
Modified: branches/JBoss_Portal_Branch_2_4/cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/cms/build.xml 2007-07-18 09:20:53 UTC (rev 7818)
+++ branches/JBoss_Portal_Branch_2_4/cms/build.xml 2007-07-18 10:48:17 UTC (rev 7819)
@@ -192,7 +192,7 @@
<fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
<!-- cms optimization integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
+ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
<fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
@@ -220,7 +220,7 @@
<fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
<!-- cms optimization integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
+ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
<fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
Modified: branches/JBoss_Portal_Branch_2_4/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/build.xml 2007-07-18 09:20:53 UTC (rev 7818)
+++ branches/JBoss_Portal_Branch_2_4/core/build.xml 2007-07-18 10:48:17 UTC (rev 7819)
@@ -319,7 +319,7 @@
<fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/>
<fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
<fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
+ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
<fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
<!-- cms optimization integration - this contains a clustered cache enabled version -->
<fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
16 years, 10 months
JBoss Portal SVN: r7818 - trunk/core/src/main/org/jboss/portal/test/core.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-18 05:20:53 -0400 (Wed, 18 Jul 2007)
New Revision: 7818
Modified:
trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
Log:
Clean the roles association after each test
Modified: trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2007-07-18 09:08:04 UTC (rev 7817)
+++ trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2007-07-18 09:20:53 UTC (rev 7818)
@@ -73,7 +73,7 @@
DelegatingPolicy p = (DelegatingPolicy)Policy.getPolicy();
p.delete("ctxid");
p.refresh();
-
+ unsetSubjectForRole();
super.tearDown();
}
@@ -109,4 +109,10 @@
subject.getPrincipals().add(roleGroup);
SecurityAssociation.setSubject(subject);
}
+
+ protected void unsetSubjectForRole() throws Exception
+ {
+ SecurityAssociation.setSubject(null);
+ }
+
}
16 years, 10 months
JBoss Portal SVN: r7817 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-18 05:08:04 -0400 (Wed, 18 Jul 2007)
New Revision: 7817
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
Log:
Clean the roles association after each test
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2007-07-18 08:25:12 UTC (rev 7816)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2007-07-18 09:08:04 UTC (rev 7817)
@@ -73,7 +73,7 @@
DelegatingPolicy p = (DelegatingPolicy)Policy.getPolicy();
p.delete("ctxid");
p.refresh();
-
+ unsetSubjectForRole();
super.tearDown();
}
@@ -109,4 +109,10 @@
subject.getPrincipals().add(roleGroup);
SecurityAssociation.setSubject(subject);
}
+
+ protected void unsetSubjectForRole() throws Exception
+ {
+ SecurityAssociation.setSubject(null);
+ }
+
}
16 years, 10 months
JBoss Portal SVN: r7816 - branches/JBoss_Portal_Branch_2_6/core-wsrp.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-18 04:25:12 -0400 (Wed, 18 Jul 2007)
New Revision: 7816
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath
Log:
Eclipse classpath
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath 2007-07-18 07:33:25 UTC (rev 7815)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath 2007-07-18 08:25:12 UTC (rev 7816)
@@ -4,5 +4,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry combineaccessrules="false" kind="src" path="/wsrp"/>
<classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
+ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
16 years, 10 months