JBoss Portal SVN: r7939 - trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 08:46:17 -0400 (Wed, 15 Aug 2007)
New Revision: 7939
Modified:
trunk/build/build-thirdparty.xml
Log:
Using Apache portals bridges 1.0.3
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-08-15 12:43:28 UTC (rev 7938)
+++ trunk/build/build-thirdparty.xml 2007-08-15 12:46:17 UTC (rev 7939)
@@ -117,7 +117,7 @@
<componentref name="jbpm/jaronly" version="3.1.2"/>
<componentref name="freemarker" version="2.3.9"/>
<componentref name="wutka-dtdparser" version="1.2.1"/>
- <componentref name="portals-bridges" version="1.0"/>
+ <componentref name="portals-bridges" version="1.0.3"/>
<componentref name="portletbridge" version="1.1.2"/>
</build>
18 years, 8 months
JBoss Portal SVN: r7938 - branches/JBoss_Portal_Branch_2_4/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 08:43:28 -0400 (Wed, 15 Aug 2007)
New Revision: 7938
Modified:
branches/JBoss_Portal_Branch_2_4/build/build-thirdparty.xml
Log:
Using Apache portals bridges 1.0.3
Modified: branches/JBoss_Portal_Branch_2_4/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/build/build-thirdparty.xml 2007-08-15 12:40:58 UTC (rev 7937)
+++ branches/JBoss_Portal_Branch_2_4/build/build-thirdparty.xml 2007-08-15 12:43:28 UTC (rev 7938)
@@ -97,7 +97,7 @@
<componentref name="junit" version="3.8.1"/>
<componentref name="odmg" version="3.0"/>
<componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="portals-bridges" version="1.0"/>
+ <componentref name="portals-bridges" version="1.0.3"/>
<componentref name="qdox" version="1.4"/>
<componentref name="trove" version="1.0.2"/>
<componentref name="slf4j" version="1.0.2"/>
18 years, 8 months
JBoss Portal SVN: r7937 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 08:40:58 -0400 (Wed, 15 Aug 2007)
New Revision: 7937
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
Log:
Using Apache portals bridges 1.0.3
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-15 12:06:23 UTC (rev 7936)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-15 12:40:58 UTC (rev 7937)
@@ -116,7 +116,7 @@
<componentref name="jbpm/jaronly" version="3.1.2"/>
<componentref name="freemarker" version="2.3.9"/>
<componentref name="wutka-dtdparser" version="1.2.1"/>
- <componentref name="portals-bridges" version="1.0"/>
+ <componentref name="portals-bridges" version="1.0.3"/>
</build>
<synchronizeinfo/>
18 years, 8 months
JBoss Portal SVN: r7936 - modules/common/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 08:06:23 -0400 (Wed, 15 Aug 2007)
New Revision: 7936
Modified:
modules/common/trunk/build/
Log:
Ignore local.properties
Property changes on: modules/common/trunk/build
___________________________________________________________________
Name: svn:ignore
+ local.properties
18 years, 8 months
JBoss Portal SVN: r7935 - in modules/common/trunk: common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 08:05:50 -0400 (Wed, 15 Aug 2007)
New Revision: 7935
Modified:
modules/common/trunk/
modules/common/trunk/common/
Log:
Ignore ouput and thirdparty
Property changes on: modules/common/trunk
___________________________________________________________________
Name: svn:ignore
+ thirdparty
Property changes on: modules/common/trunk/common
___________________________________________________________________
Name: svn:ignore
+ output
18 years, 8 months
JBoss Portal SVN: r7934 - in modules/common/trunk: .settings and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 08:00:28 -0400 (Wed, 15 Aug 2007)
New Revision: 7934
Added:
modules/common/trunk/.classpath
modules/common/trunk/.project
modules/common/trunk/.settings/
modules/common/trunk/.settings/org.eclipse.jdt.core.prefs
Log:
Eclipse files
Added: modules/common/trunk/.classpath
===================================================================
--- modules/common/trunk/.classpath (rev 0)
+++ modules/common/trunk/.classpath 2007-08-15 12:00:28 UTC (rev 7934)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="common/src/main"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/>
+ <classpathentry kind="lib" path="/tools/lib/cargo-core-uberjar-0.8.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
+ <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar" sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: modules/common/trunk/.project
===================================================================
--- modules/common/trunk/.project (rev 0)
+++ modules/common/trunk/.project 2007-08-15 12:00:28 UTC (rev 7934)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>common_module</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: modules/common/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- modules/common/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ modules/common/trunk/.settings/org.eclipse.jdt.core.prefs 2007-08-15 12:00:28 UTC (rev 7934)
@@ -0,0 +1,12 @@
+#Wed Aug 15 12:04:04 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
18 years, 8 months
JBoss Portal SVN: r7933 - in branches/JBoss_Portal_Branch_2_6: cms and 22 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 07:31:26 -0400 (Wed, 15 Aug 2007)
New Revision: 7933
Modified:
branches/JBoss_Portal_Branch_2_6/bridge/.classpath
branches/JBoss_Portal_Branch_2_6/cms/.classpath
branches/JBoss_Portal_Branch_2_6/core-admin/.classpath
branches/JBoss_Portal_Branch_2_6/core-cms/.classpath
branches/JBoss_Portal_Branch_2_6/core-samples/.classpath
branches/JBoss_Portal_Branch_2_6/core-search/.classpath
branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath
branches/JBoss_Portal_Branch_2_6/core/.classpath
branches/JBoss_Portal_Branch_2_6/faces/.classpath
branches/JBoss_Portal_Branch_2_6/format/.classpath
branches/JBoss_Portal_Branch_2_6/identity/.classpath
branches/JBoss_Portal_Branch_2_6/jems/.classpath
branches/JBoss_Portal_Branch_2_6/portlet-federation/.classpath
branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath
branches/JBoss_Portal_Branch_2_6/portlet/.classpath
branches/JBoss_Portal_Branch_2_6/registration/.classpath
branches/JBoss_Portal_Branch_2_6/search/.classpath
branches/JBoss_Portal_Branch_2_6/security/.classpath
branches/JBoss_Portal_Branch_2_6/server/.classpath
branches/JBoss_Portal_Branch_2_6/test/.classpath
branches/JBoss_Portal_Branch_2_6/theme/.classpath
branches/JBoss_Portal_Branch_2_6/widget/.classpath
branches/JBoss_Portal_Branch_2_6/workflow/.classpath
branches/JBoss_Portal_Branch_2_6/wsrp/.classpath
Log:
Update Eclipse classpath after modularization
Modified: branches/JBoss_Portal_Branch_2_6/bridge/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/bridge/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/bridge/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -11,6 +11,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/cms/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/jakarta-io/lib/commons-io.jar"/>
<classpathentry kind="src" path="src/resources/test"/>
@@ -44,5 +43,6 @@
<classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/search"/>
<classpathentry kind="lib" path="/thirdparty/apache-lucene/lib/lucene.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/core/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -36,7 +36,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
<classpathentry combineaccessrules="false" kind="src" path="/cms"/>
<classpathentry combineaccessrules="false" kind="src" path="/test"/>
@@ -50,6 +49,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry kind="lib" path="/thirdparty/freemarker/lib/freemarker.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/web"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/faces"/>
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
<classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/>
@@ -21,5 +20,6 @@
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -8,7 +8,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
@@ -25,5 +24,6 @@
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/search"/>
<classpathentry kind="lib" path="/thirdparty/apache-lucene/lib/lucene.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -6,12 +6,12 @@
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/format"/>
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry combineaccessrules="false" kind="src" path="/theme"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-fileupload/lib/commons-fileupload.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-search/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-search/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/core-search/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -11,9 +11,9 @@
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry combineaccessrules="false" kind="src" path="/search"/>
<classpathentry combineaccessrules="false" kind="src" path="/faces"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -4,8 +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="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/faces/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/faces/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/faces/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -4,7 +4,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/facelets/lib/jsf-facelets.jar"/>
<classpathentry kind="lib" path="/thirdparty/el/lib/el-api.jar"/>
@@ -15,5 +14,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/bridge"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/format/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/format/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/format/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -3,11 +3,11 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="output/gen/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/identity/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/identity/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/identity/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -15,12 +15,12 @@
<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/test"/>
<classpathentry kind="lib" path="/thirdparty/sun-opends/lib/OpenDS.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/jems/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/jems/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/jems/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -23,7 +23,7 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar" sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jmx-invoker-adaptor-client.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/portlet/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/portlet/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -21,10 +21,10 @@
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/test"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
- <classpathentry combineaccessrules="false" kind="src" path="/web"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/portlet-federation/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet-federation/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/portlet-federation/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -20,6 +20,6 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jmx-invoker-adaptor-client.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
@@ -14,5 +13,6 @@
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/registration/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/registration/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/registration/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
@@ -10,5 +9,6 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/search/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/search/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/search/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -8,8 +8,8 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-lucene/lib/lucene.jar"/>
<classpathentry kind="lib" path="/thirdparty/jcr/lib/jcr-1.0.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/security/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/security/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/security/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
@@ -17,5 +16,6 @@
<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/server/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/server/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/test"/>
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
@@ -13,7 +12,8 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
- <classpathentry combineaccessrules="false" kind="src" path="/web"/>
<classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/test/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/test/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/test/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -7,7 +7,6 @@
<classpathentry kind="lib" path="/tools/lib/xalan.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="selenium-java-client-driver-backport.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
@@ -28,5 +27,6 @@
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-opends/lib/OpenDS.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/theme/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/theme/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -15,10 +15,10 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/web"/>
<classpathentry combineaccessrules="false" kind="src" path="/test"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/widget/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/widget/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -2,11 +2,13 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/workflow/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/workflow/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -10,8 +10,8 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
<classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/.classpath 2007-08-15 11:06:17 UTC (rev 7932)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/.classpath 2007-08-15 11:31:26 UTC (rev 7933)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/generated"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
@@ -30,6 +29,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/web"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
18 years, 8 months
JBoss Portal SVN: r7932 - in trunk: identity/src/main/org/jboss/portal/identity/db and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 07:06:17 -0400 (Wed, 15 Aug 2007)
New Revision: 7932
Modified:
trunk/common/src/main/org/jboss/portal/common/util/Tools.java
trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java
trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java
trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java
trunk/identity/src/resources/hibernate/domain-identity.hbm.xml
Log:
Returns ordered Set of users and roles when searching on database
Modified: trunk/common/src/main/org/jboss/portal/common/util/Tools.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2007-08-15 11:02:36 UTC (rev 7931)
+++ trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2007-08-15 11:06:17 UTC (rev 7932)
@@ -41,6 +41,7 @@
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.ResourceBundle;
@@ -239,9 +240,35 @@
return set;
}
+ /**
+ * Transforms an iterator into an unordered Set
+ *
+ * @param iterator The iterator to transform
+ * @return A HashSet
+ */
public static Set toSet(Iterator iterator)
{
- HashSet set = new HashSet();
+ return toSet(iterator, false);
+ }
+
+ /**
+ * Transforms an iterator into a Set
+ *
+ * @param iterator The iterator to transform
+ * @param ordered true if the set must respect the ordering of the iterator
+ * @return a LinkedHashSet if ordered is true, a HashSet otherwise
+ */
+ public static Set toSet(Iterator iterator, boolean ordered)
+ {
+ Set set = null;
+ if (ordered)
+ {
+ set = new LinkedHashSet();
+ }
+ else
+ {
+ set = new HashSet();
+ }
while (iterator.hasNext())
{
set.add(iterator.next());
Modified: trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java 2007-08-15 11:02:36 UTC (rev 7931)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java 2007-08-15 11:06:17 UTC (rev 7932)
@@ -273,9 +273,9 @@
try
{
Session session = getCurrentSession();
- Query query = session.createQuery("from HibernateRoleImpl");
+ Query query = session.createQuery("from HibernateRoleImpl as r order by r.name");
Iterator iterator = query.iterate();
- return Tools.toSet(iterator);
+ return Tools.toSet(iterator, true);
}
catch (HibernateException e)
{
@@ -300,19 +300,19 @@
userNameFilter = "%" + userNameFilter.replaceAll("%", "") + "%";
//
- query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name" + " AND user.userName LIKE :filter");
+ query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name" + " AND user.userName LIKE :filter order by user.userName");
query.setString("filter", userNameFilter);
}
else
{
- query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name");
+ query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name order by user.userName");
}
query.setString("name", roleName);
query.setFirstResult(offset);
query.setMaxResults(limit);
Iterator iterator = query.iterate();
- Set result = Tools.toSet(iterator);
+ Set result = Tools.toSet(iterator, true);
Set newResult = new HashSet();
Iterator cleaner = result.iterator();
Modified: trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java 2007-08-15 11:02:36 UTC (rev 7931)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java 2007-08-15 11:06:17 UTC (rev 7932)
@@ -231,11 +231,11 @@
try
{
Session session = getCurrentSession();
- Query query = session.createQuery("from HibernateUserImpl");
+ Query query = session.createQuery("from HibernateUserImpl as u order by u.userName");
query.setFirstResult(offset);
query.setMaxResults(limit);
Iterator iterator = query.iterate();
- return Tools.toSet(iterator);
+ return Tools.toSet(iterator, true);
}
catch (HibernateException e)
{
@@ -254,12 +254,12 @@
//
Session session = getCurrentSession();
- Query query = session.createQuery("from HibernateUserImpl as u where u.userName like :filter");
+ Query query = session.createQuery("from HibernateUserImpl as u where u.userName like :filter order by u.userName");
query.setString("filter", filter);
query.setFirstResult(offset);
query.setMaxResults(limit);
Iterator iterator = query.iterate();
- return Tools.toSet(iterator);
+ return Tools.toSet(iterator, true);
}
catch (HibernateException e)
{
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-15 11:02:36 UTC (rev 7931)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-15 11:06:17 UTC (rev 7932)
@@ -75,46 +75,31 @@
{
ctx.begin();
Set set1 = userModule.findUsersFilteredByUserName("user", 0, 10);
- Set nameSet1 = new HashSet();
- for (Iterator i = set1.iterator(); i.hasNext();)
- {
- User user = (User)i.next();
- nameSet1.add(user.getUserName());
- }
- Set expectedNameSet1 = new HashSet();
- expectedNameSet1.add("user1");
- expectedNameSet1.add("user2");
- assertEquals(expectedNameSet1, nameSet1);
-
+ Iterator it = set1.iterator();
+ User user = (User)it.next();
+ assertEquals("user1", user.getUserName());
+ user = (User)it.next();
+ assertEquals("user2", user.getUserName());
+
//
Set set2 = userModule.findUsersFilteredByUserName("blah", 0, 10);
assertEquals(0, set2.size());
//
Set set3 = userModule.findUsersFilteredByUserName("", 0, 10);
- Set nameSet3 = new HashSet();
- for (Iterator i = set3.iterator(); i.hasNext();)
- {
- User user = (User)i.next();
- nameSet3.add(user.getUserName());
- }
- Set expectedNameSet3 = new HashSet();
- expectedNameSet3.add("user1");
- expectedNameSet3.add("user2");
- expectedNameSet3.add("admin");
- assertEquals(expectedNameSet3, nameSet3);
+ it = set3.iterator();
+ user = (User)it.next();
+ assertEquals("admin", user.getUserName());
+ user = (User)it.next();
+ assertEquals("user1", user.getUserName());
+ user = (User)it.next();
+ assertEquals("user2", user.getUserName());
//
Set set4 = userModule.findUsersFilteredByUserName("user1", 0, 10);
- Set nameSet4 = new HashSet();
- for (Iterator i = set4.iterator(); i.hasNext();)
- {
- User user = (User)i.next();
- nameSet4.add(user.getUserName());
- }
- Set expectedNameSet4 = new HashSet();
- expectedNameSet4.add("user1");
- assertEquals(expectedNameSet4, nameSet4);
+ it = set4.iterator();
+ user = (User)it.next();
+ assertEquals("user1", user.getUserName());
ctx.commit();
}
Modified: trunk/identity/src/resources/hibernate/domain-identity.hbm.xml
===================================================================
--- trunk/identity/src/resources/hibernate/domain-identity.hbm.xml 2007-08-15 11:02:36 UTC (rev 7931)
+++ trunk/identity/src/resources/hibernate/domain-identity.hbm.xml 2007-08-15 11:06:17 UTC (rev 7932)
@@ -124,7 +124,7 @@
lazy="false"
inverse="false"
cascade="none"
- sort="unsorted">
+ sort="name">
<!--<cache usage="@portal.hibernate.cache.usage@"/>-->
<key column="jbp_uid"/>
<many-to-many
18 years, 8 months
JBoss Portal SVN: r7931 - modules/common/trunk/common/src/main/org/jboss/portal/common/util.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 07:02:36 -0400 (Wed, 15 Aug 2007)
New Revision: 7931
Modified:
modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java
Log:
Return ordered Set of users and roles when searching on database
Modified: modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java
===================================================================
--- modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2007-08-15 11:01:57 UTC (rev 7930)
+++ modules/common/trunk/common/src/main/org/jboss/portal/common/util/Tools.java 2007-08-15 11:02:36 UTC (rev 7931)
@@ -41,6 +41,7 @@
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.ResourceBundle;
@@ -239,9 +240,35 @@
return set;
}
+ /**
+ * Transforms an iterator into an unordered Set
+ *
+ * @param iterator The iterator to transform
+ * @return A HashSet
+ */
public static Set toSet(Iterator iterator)
{
- HashSet set = new HashSet();
+ return toSet(iterator, false);
+ }
+
+ /**
+ * Transforms an iterator into a Set
+ *
+ * @param iterator The iterator to transform
+ * @param ordered true if the set must respect the ordering of the iterator
+ * @return a LinkedHashSet if ordered is true, a HashSet otherwise
+ */
+ public static Set toSet(Iterator iterator, boolean ordered)
+ {
+ Set set = null;
+ if (ordered)
+ {
+ set = new LinkedHashSet();
+ }
+ else
+ {
+ set = new HashSet();
+ }
while (iterator.hasNext())
{
set.add(iterator.next());
18 years, 8 months
JBoss Portal SVN: r7930 - in branches/JBoss_Portal_Branch_2_6/identity/src: main/org/jboss/portal/test/identity and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-15 07:01:57 -0400 (Wed, 15 Aug 2007)
New Revision: 7930
Modified:
branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java
branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java
branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java
branches/JBoss_Portal_Branch_2_6/identity/src/resources/hibernate/domain-identity.hbm.xml
Log:
Return ordered Set of users and roles when searching on database
Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java 2007-08-15 09:17:32 UTC (rev 7929)
+++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateRoleModuleImpl.java 2007-08-15 11:01:57 UTC (rev 7930)
@@ -273,9 +273,9 @@
try
{
Session session = getCurrentSession();
- Query query = session.createQuery("from HibernateRoleImpl");
+ Query query = session.createQuery("from HibernateRoleImpl as r order by r.name");
Iterator iterator = query.iterate();
- return Tools.toSet(iterator);
+ return Tools.toSet(iterator, true);
}
catch (HibernateException e)
{
@@ -300,19 +300,19 @@
userNameFilter = "%" + userNameFilter.replaceAll("%", "") + "%";
//
- query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name" + " AND user.userName LIKE :filter");
+ query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name" + " AND user.userName LIKE :filter order by user.userName");
query.setString("filter", userNameFilter);
}
else
{
- query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name");
+ query = session.createQuery("from HibernateUserImpl as user left join user.roles role where role.name=:name order by user.userName");
}
query.setString("name", roleName);
query.setFirstResult(offset);
query.setMaxResults(limit);
Iterator iterator = query.iterate();
- Set result = Tools.toSet(iterator);
+ Set result = Tools.toSet(iterator, true);
Set newResult = new HashSet();
Iterator cleaner = result.iterator();
Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java 2007-08-15 09:17:32 UTC (rev 7929)
+++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/db/HibernateUserModuleImpl.java 2007-08-15 11:01:57 UTC (rev 7930)
@@ -231,11 +231,11 @@
try
{
Session session = getCurrentSession();
- Query query = session.createQuery("from HibernateUserImpl");
+ Query query = session.createQuery("from HibernateUserImpl as u order by u.userName");
query.setFirstResult(offset);
query.setMaxResults(limit);
Iterator iterator = query.iterate();
- return Tools.toSet(iterator);
+ return Tools.toSet(iterator, true);
}
catch (HibernateException e)
{
@@ -254,12 +254,12 @@
//
Session session = getCurrentSession();
- Query query = session.createQuery("from HibernateUserImpl as u where u.userName like :filter");
+ Query query = session.createQuery("from HibernateUserImpl as u where u.userName like :filter order by u.userName");
query.setString("filter", filter);
query.setFirstResult(offset);
query.setMaxResults(limit);
Iterator iterator = query.iterate();
- return Tools.toSet(iterator);
+ return Tools.toSet(iterator, true);
}
catch (HibernateException e)
{
Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-15 09:17:32 UTC (rev 7929)
+++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-15 11:01:57 UTC (rev 7930)
@@ -75,46 +75,31 @@
{
ctx.begin();
Set set1 = userModule.findUsersFilteredByUserName("user", 0, 10);
- Set nameSet1 = new HashSet();
- for (Iterator i = set1.iterator(); i.hasNext();)
- {
- User user = (User)i.next();
- nameSet1.add(user.getUserName());
- }
- Set expectedNameSet1 = new HashSet();
- expectedNameSet1.add("user1");
- expectedNameSet1.add("user2");
- assertEquals(expectedNameSet1, nameSet1);
-
+ Iterator it = set1.iterator();
+ User user = (User)it.next();
+ assertEquals("user1", user.getUserName());
+ user = (User)it.next();
+ assertEquals("user2", user.getUserName());
+
//
Set set2 = userModule.findUsersFilteredByUserName("blah", 0, 10);
assertEquals(0, set2.size());
//
Set set3 = userModule.findUsersFilteredByUserName("", 0, 10);
- Set nameSet3 = new HashSet();
- for (Iterator i = set3.iterator(); i.hasNext();)
- {
- User user = (User)i.next();
- nameSet3.add(user.getUserName());
- }
- Set expectedNameSet3 = new HashSet();
- expectedNameSet3.add("user1");
- expectedNameSet3.add("user2");
- expectedNameSet3.add("admin");
- assertEquals(expectedNameSet3, nameSet3);
+ it = set3.iterator();
+ user = (User)it.next();
+ assertEquals("admin", user.getUserName());
+ user = (User)it.next();
+ assertEquals("user1", user.getUserName());
+ user = (User)it.next();
+ assertEquals("user2", user.getUserName());
//
Set set4 = userModule.findUsersFilteredByUserName("user1", 0, 10);
- Set nameSet4 = new HashSet();
- for (Iterator i = set4.iterator(); i.hasNext();)
- {
- User user = (User)i.next();
- nameSet4.add(user.getUserName());
- }
- Set expectedNameSet4 = new HashSet();
- expectedNameSet4.add("user1");
- assertEquals(expectedNameSet4, nameSet4);
+ it = set4.iterator();
+ user = (User)it.next();
+ assertEquals("user1", user.getUserName());
ctx.commit();
}
Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/hibernate/domain-identity.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/identity/src/resources/hibernate/domain-identity.hbm.xml 2007-08-15 09:17:32 UTC (rev 7929)
+++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/hibernate/domain-identity.hbm.xml 2007-08-15 11:01:57 UTC (rev 7930)
@@ -124,7 +124,7 @@
lazy="false"
inverse="false"
cascade="none"
- sort="unsorted">
+ sort="name">
<!--<cache usage="@portal.hibernate.cache.usage@"/>-->
<key column="jbp_uid"/>
<many-to-many
18 years, 8 months