August 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r7970 - in branches/JBoss_Portal_Branch_2_6: jems/src/main/org/jboss/portal/jems/as and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-08-17 06:17:39 -0400 (Fri, 17 Aug 2007) New Revision: 7970 Added: branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/as/JNDIBinder.java Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml Log: added a JNDIBinder service that will be used to decouple the identity module from the jems module Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml 2007-08-17 09:29:00 UTC (rev 7969) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml 2007-08-17 10:17:39 UTC (rev 7970) @@ -137,6 +137,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Added: branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/as/JNDIBinder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/as/JNDIBinder.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/as/JNDIBinder.java 2007-08-17 10:17:39 UTC (rev 7970) @@ -0,0 +1,95 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.jems.as; + +import org.jboss.portal.jems.as.system.AbstractJBossService; + +/** + * A service that binds an injected service to the JNDI registry. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class JNDIBinder extends AbstractJBossService +{ + + /** The jndi name. */ + private String jndiName; + + /** The injected service that will be bound. */ + private Object targetObject; + + /** The jndi binding object. */ + private JNDI.Binding jndiBinding; + + public String getJNDIName() + { + return jndiName; + } + + public void setJNDIName(String jndiName) + { + this.jndiName = jndiName; + } + + public Object getTargetObject() + { + return targetObject; + } + + public void setTargetObject(Object targetObject) + { + this.targetObject = targetObject; + } + + protected void createService() throws Exception + { + if (jndiName == null) + { + throw new IllegalStateException("No jndi name provided"); + } + } + + protected void startService() throws Exception + { + if (targetObject == null) + { + throw new IllegalStateException("No target object to bind"); + } + + // + log.debug("About to bind service" + targetObject + " to JNDI with name " + jndiName); + jndiBinding = new JNDI.Binding(jndiName, this); + jndiBinding.bind(); + log.debug("Service" + targetObject + " bound to JNDI with name " + jndiName); + } + + protected void stopService() throws Exception + { + if (jndiBinding != null) + { + jndiBinding.unbind(); + jndiBinding = null; + } + } +}

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7969 - in branches/JBoss_Portal_Branch_2_6: build and 27 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-08-17 05:29:00 -0400 (Fri, 17 Aug 2007) New Revision: 7969 Removed: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/ branches/JBoss_Portal_Branch_2_6/test/ 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/ide/intellij/idea60/jboss-portal.ipr branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml branches/JBoss_Portal_Branch_2_6/cms/build.xml branches/JBoss_Portal_Branch_2_6/core-admin/build.xml branches/JBoss_Portal_Branch_2_6/core-cms/build.xml branches/JBoss_Portal_Branch_2_6/core-management/build.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml branches/JBoss_Portal_Branch_2_6/core/build.xml branches/JBoss_Portal_Branch_2_6/identity/build.xml branches/JBoss_Portal_Branch_2_6/jems/build.xml branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml branches/JBoss_Portal_Branch_2_6/portlet/build.xml branches/JBoss_Portal_Branch_2_6/server/build.xml branches/JBoss_Portal_Branch_2_6/testsuite/build.xml branches/JBoss_Portal_Branch_2_6/theme/build.xml branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent branches/JBoss_Portal_Branch_2_6/widget/build.xml branches/JBoss_Portal_Branch_2_6/wsrp/build.xml Log: detached module test from the 2.6 branch Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -49,7 +49,7 @@ <componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/> <componentref name="jboss-portal/modules/web" version="1.0.0-SNAPSHOT"/> - + <componentref name="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/> <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 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -111,7 +111,6 @@  - <module name="test"/> <module name="jems"/> <module name="security"/> <module name="faces"/> @@ -142,15 +141,15 @@ <group name="portal"> <include - modules="test, api, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/> + modules="api, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/> </group> <group name="cms"> - <include modules="test, jems, workflow, cms"/> + <include modules="jems, workflow, cms"/> </group> <group name="security"> - <include modules="test, jems, security"/> + <include modules="jems, security"/> </group> <group name="default"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/jboss-portal.ipr =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/jboss-portal.ipr 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/jboss-portal.ipr 2007-08-17 09:29:00 UTC (rev 7969) @@ -254,7 +254,6 @@ <modules> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/api/api.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/api/api.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" /> - <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-admin/core-admin.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-admin/core-admin.iml" /> @@ -274,12 +273,10 @@ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/search/search.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/search/search.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/security/security.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/security/security.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/server/server.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/server/server.iml" /> - <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" /> - <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" /> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -19,7 +19,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="test" /> <orderEntry type="module" module-name="server" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -62,7 +62,6 @@ </library> </orderEntry> <orderEntry type="module" module-name="cms" /> - <orderEntry type="module" module-name="test" /> <orderEntry type="module" module-name="identity" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="test" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="test" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -30,7 +30,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="test" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -19,7 +19,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="test" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -95,7 +95,6 @@ </library> </orderEntry> <orderEntry type="module" module-name="jems" /> - <orderEntry type="module" module-name="test" /> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-17 09:29:00 UTC (rev 7969) @@ -26,7 +26,6 @@ </library> </orderEntry> <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="test" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -89,6 +89,7 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="apache.logging.classpath"/> <path refid="apache.xerces.classpath"/> <path refid="apache.log4j.classpath"/> @@ -128,7 +129,6 @@ <path id="dependentmodule.classpath"> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-search.classpath"/>  <path refid="jboss.portal-identity.classpath"/> @@ -376,14 +376,14 @@ <path refid="cglib.cglib.classpath"/> <path refid="apache.httpclient.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> - <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> <pathelement location="${build.lib}/portal-cms-lib.jar"/> <pathelement location="${build.resources}/portal-cms-sar"/> <pathelement location="${build.resources}/test"/> <pathelement location="${build.resources}/hibernate"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/>  <path refid="jackrabbit.jackrabbit.classpath"/> <path refid="jboss.cache.classpath"/> @@ -473,7 +473,7 @@ <path refid="cglib.cglib.classpath"/> <path refid="apache.httpclient.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> - <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal-search.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> @@ -481,7 +481,7 @@ <pathelement location="${build.resources}/portal-cms-sar"/> <pathelement location="${build.resources}/test"/> <pathelement location="${build.resources}/hibernate"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/>  <path refid="jackrabbit.jackrabbit.classpath"/> <path refid="nekohtml.nekohtml.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -89,6 +89,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -133,7 +134,6 @@ <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-security.classpath"/> - <path refid="jboss.portal-test.classpath"/> </path>  @@ -643,7 +643,7 @@ <pathelement location="${build.lib}/portal-core-lib.jar"/> <pathelement location="${build.lib}/portal-core-test-lib.jar"/> <pathelement location="${build.resources}/jboss-portal.sar"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/> <pathelement location="${build.resources}"/> <path refid="apache.collections.classpath"/> @@ -691,7 +691,7 @@ <pathelement location="${build.lib}/portal-core-lib.jar"/> <pathelement location="${build.lib}/portal-core-test-lib.jar"/> <pathelement location="${build.resources}/portal-core-sar"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/> <path refid="oswego.concurrent.classpath"/> <path refid="jboss.microcontainer.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -88,6 +88,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -115,7 +116,6 @@ <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-security.classpath"/> - <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-core.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -88,6 +88,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -130,7 +131,6 @@ <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portal-theme.classpath"/> - <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-core.classpath"/> <path refid="jboss.portal-workflow.classpath"/> <path refid="jboss.portal-core-admin.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-management/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -88,6 +88,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -126,7 +127,6 @@ <path refid="jboss.portal-portlet-federation.classpath"/> <path refid="jboss.portal-identity.classpath"/> <path refid="jboss.portal-security.classpath"/> - <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-core.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -88,6 +88,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -116,7 +117,6 @@ <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-security.classpath"/> - <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-core.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/identity/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/identity/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -90,6 +90,7 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.jbossxb.classpath"/> @@ -110,9 +111,7 @@  <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-core.classpath"/> </path>  @@ -270,7 +269,7 @@  <jar jarfile="${build.lib}/test-identity.sar"> <fileset dir="${build.resources}/test-identity-sar"/> - <fileset dir="../test/output/lib" includes="portal-test-agent-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-agent-lib.jar"/> <fileset dir="${sun.opends.lib}" includes="OpenDS.jar"/> <fileset dir="${sleepycat.sleepycat.lib}" includes="je.jar"/> </jar> @@ -282,7 +281,7 @@  <jar jarfile="${build.lib}/opends.sar"> <fileset dir="${build.resources}/opends-sar"/> - <fileset dir="../test/output/lib" includes="portal-test-agent-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-agent-lib.jar"/> <fileset dir="${sun.opends.lib}" includes="OpenDS.jar"/> <fileset dir="${sleepycat.sleepycat.lib}" includes="je.jar"/> </jar> @@ -333,9 +332,7 @@ <target name="deploy-ldap" depends="init, package-tests" if="HAVE_JDK_1.5" > <mkdir dir="${jboss.home}/server/default/conf/opends"/> - <copy todir="${jboss.home}/server/default/conf/opends" overwrite="true" failonerror="false"> - <fileset dir="../test/output/etc/opends"/> - </copy> + <unzip src="${jboss.portal/modules/test.lib}/opends.zip" dest="${jboss.home}/server/default/conf/opends" overwrite="true"/> <copy file="${build.lib}/test-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" failonerror="false"/> <sleep seconds="30"/> </target> @@ -368,7 +365,7 @@ <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> <pathelement location="${build.lib}/portal-identity-test-lib.jar"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/>  <pathelement location="${build.resources}/hibernate"/> <pathelement location="${build.resources}"/> @@ -390,7 +387,7 @@ <path refid="junit.junit.classpath"/> <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> - <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sun.jaf.classpath"/> @@ -430,7 +427,7 @@ <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> <pathelement location="${build.lib}/portal-identity-test-lib.jar"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/>  <pathelement location="${build.resources}/hibernate"/> <pathelement location="${build.resources}"/> @@ -454,7 +451,7 @@ <path refid="junit.junit.classpath"/> <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> - <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sleepycat.sleepycat.classpath"/> @@ -493,7 +490,7 @@ <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> <pathelement location="${build.lib}/portal-identity-test-lib.jar"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/>  <pathelement location="${build.resources}/hibernate"/> <pathelement location="${build.resources}"/> @@ -520,7 +517,7 @@ <path refid="junit.junit.classpath"/> <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> - <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sleepycat.sleepycat.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/jems/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/jems/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/jems/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -89,6 +89,7 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="beanshell.beanshell.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -99,7 +100,6 @@  <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-test.classpath"/> </path>  Modified: branches/JBoss_Portal_Branch_2_6/portlet/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -90,6 +90,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.serialization.classpath"/> @@ -110,7 +111,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portlet-api.classpath"/> - <path refid="jboss.portal-test.classpath"/> </path>  Modified: branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -89,6 +89,7 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.microcontainer.classpath"/> @@ -112,7 +113,6 @@ <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> - <path refid="jboss.portal-test.classpath"/> </path>  Modified: branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -90,6 +90,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.serialization.classpath"/> @@ -114,7 +115,6 @@ <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portlet-api.classpath"/> - <path refid="jboss.portal-test.classpath"/> </path>  @@ -197,7 +197,7 @@ </jar> <copy todir="${build.resources}/test-sar"> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> - <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-test-framework-lib.jar"/> @@ -218,7 +218,7 @@ <jar jarfile="${build.lib}/test-info.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> - <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/server/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -92,6 +92,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -116,7 +117,6 @@ <path id="dependentmodule.classpath"> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-test.classpath"/> </path>  @@ -196,7 +196,7 @@ <jar jarfile="${build.lib}/test-parameters.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> - <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> @@ -218,7 +218,7 @@ </jar> <jar jarfile="${build.lib}/test-servlet.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> - <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> @@ -234,7 +234,7 @@ <jar jarfile="${build.lib}/test-charset.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> - <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> @@ -247,7 +247,7 @@ <jar jarfile="${build.lib}/test-response.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> - <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/testsuite/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/testsuite/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -213,12 +213,12 @@  <target name="agent-deploy"> - <deploy file="../test/output/lib/portal-test.sar" config="default"/> + <deploy file="${jboss.portal/modules/test.lib}/portal-test-agent.sar" config="default"/> </target>  <target name="agent-undeploy"> - <undeploy file="../test/output/lib/portal-test.sar" config="default"/> + <undeploy file="${jboss.portal/modules/test.lib}/portal-test.sar" config="default"/> </target> <target name="help"> Modified: branches/JBoss_Portal_Branch_2_6/theme/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -92,6 +92,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -113,7 +114,6 @@ <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> - <path refid="jboss.portal-test.classpath"/> </path>  @@ -237,7 +237,7 @@ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> <fileset dir="${jboss.portal-theme.root}/lib" includes="portal-theme-lib.jar"/> - <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal-test.root}/lib/../.." includes="selenium-java-client-driver-backport.jar"/> <fileset dir="${build.lib}" includes="portal-theme-test-lib.jar"/> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> @@ -279,7 +279,7 @@ <path refid="jboss.portlet-api.classpath"/> <pathelement location="${build.resources}/test"/> <pathelement location="${build.resources}/hibernate"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/> <pathelement location="${build.lib}/portal-theme-test-lib.jar"/> </x-classpath> </execute-tests> @@ -331,12 +331,12 @@ <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portlet-api.classpath"/> <pathelement location="${build.resources}/test"/> <pathelement location="${build.resources}/hibernate"/> - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/> <pathelement location="${build.lib}/portal-theme-test-lib.jar"/> <pathelement location="${jboss.portal-test.root}/lib/../../selenium-java-client-driver-backport.jar"/> </x-classpath> Modified: branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent =================================================================== --- branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-17 09:29:00 UTC (rev 7969) @@ -2,14 +2,6 @@ <target name="configure-modules" unless="configure-modules.disabled"> -  - <property name="jboss.portal-test.root" value="${project.root}/test/output"/> - <property name="jboss.portal-test.lib" value="${jboss.portal-test.root}/lib"/> - <path id="jboss.portal-test.classpath"> - <pathelement path="${jboss.portal-test.lib}/portal-test-lib.jar"/> - <pathelement path="${jboss.portal-test.lib}/portal-test-agent-lib.jar"/> - </path> -  <property name="jboss.portal-cms.root" value="${project.root}/cms/output"/> <property name="jboss.portal-cms.lib" value="${jboss.portal-cms.root}/lib"/> Modified: branches/JBoss_Portal_Branch_2_6/widget/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/widget/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -284,7 +284,7 @@ <path refid="junit.junit.classpath"/> <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> - <path refid="jboss.portal-test.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sun.jaf.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-17 09:03:22 UTC (rev 7968) +++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-17 09:29:00 UTC (rev 7969) @@ -107,6 +107,7 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="junit.junit.classpath"/> @@ -142,7 +143,6 @@ <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-portlet-federation.classpath"/> - <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-faces.classpath"/> </path> @@ -353,12 +353,12 @@  <target name="agent-deploy"> - <deploy file="../test/output/lib/portal-test.sar" config="default"/> + <deploy file="${jboss.portal/modules/test.lib}/portal-test-agent.sar" config="default"/> </target>  <target name="agent-undeploy"> - <undeploy file="../test/output/lib/portal-test.sar" config="default"/> + <undeploy file="${jboss.portal/modules/test.lib}/portal-test-agent.sar" config="default"/> </target> <target name="deploy" description="Deploy WSRP" depends="output"> @@ -490,7 +490,7 @@ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> - <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-framework-lib.jar"/> </copy> @@ -551,7 +551,7 @@ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> - <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${build.lib.test}" includes="test-wsrp-producer.jar"/> <fileset dir="${build.lib.test}" includes="test-wsrp-producer-client.jar"/> @@ -831,7 +831,7 @@ <pathelement location="${build.lib.test}/test-consumer-lib.jar"/>  - <pathelement location="${jboss.portal-test.root}/etc"/> + <pathelement location="${jboss.portal/modules/test.resources}"/> <path refid="jboss.microcontainer.classpath"/>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7968 - modules/test/trunk/test.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-08-17 05:03:22 -0400 (Fri, 17 Aug 2007) New Revision: 7968 Modified: modules/test/trunk/test/build.xml Log: added the test agent classes in portal-test-lib.jar Modified: modules/test/trunk/test/build.xml =================================================================== --- modules/test/trunk/test/build.xml 2007-08-16 22:08:57 UTC (rev 7967) +++ modules/test/trunk/test/build.xml 2007-08-17 09:03:22 UTC (rev 7968) @@ -227,7 +227,9 @@  <jar jarfile="${build.lib}/portal-test-lib.jar" manifest="${build.etc}/portal-test-lib-jar.mf"> <fileset dir="${build.classes}"> + </fileset> <fileset dir="${build.resources}/portal-test-jar"/> </jar>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7967 - in trunk/core/src/main/org/jboss: portlet/content and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-08-16 18:08:57 -0400 (Thu, 16 Aug 2007) New Revision: 7967 Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java Log: JBPORTAL-1627: Problem destroying service portal:service=ContentRenderer,type=GoogleWidgetPortletInstance Fix bad undeployment of generic content types Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-16 22:06:31 UTC (rev 7966) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-16 22:08:57 UTC (rev 7967) @@ -110,7 +110,8 @@ provider.setDecorateContent(true); provider.setContentPortletInfo(contentPortlet); provider.setRegistry(registry); - + provider.setPortalAuthorizationManagerFactory(pamf); + // Keep track registrations.register(contentType, provider); Modified: trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java =================================================================== --- trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-16 22:06:31 UTC (rev 7966) +++ trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-16 22:08:57 UTC (rev 7967) @@ -132,6 +132,7 @@ List dependencies = new ArrayList(); dependencies.add(contentProviderRegistryON); dependencies.add(instanceContainerON); + dependencies.add(pamfON); mbeanServer.invoke(scObjectName, "register", new Object[] {objectName, dependencies} , new String[] {"javax.management.ObjectName", "java.util.Collection"}); // Start the mbean @@ -164,8 +165,7 @@ // Stop the mbean MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); mbeanServer.invoke(scObjectName, "stop", new ObjectName[] {objectName} , new String[] {"javax.management.ObjectName"}); - - mbeanServer.unregisterMBean(objectName); + mbeanServer.invoke(scObjectName, "remove", new Object[] {objectName} , new String[] {"javax.management.ObjectName"}); } catch(Exception e) {

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7966 - in branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss: portlet/content and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-08-16 18:06:31 -0400 (Thu, 16 Aug 2007) New Revision: 7966 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java Log: JBPORTAL-1627: Problem destroying service portal:service=ContentRenderer,type=GoogleWidgetPortletInstance Fix bad undeployment of generic content types Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-16 19:03:25 UTC (rev 7965) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-16 22:06:31 UTC (rev 7966) @@ -110,7 +110,8 @@ provider.setDecorateContent(true); provider.setContentPortletInfo(contentPortlet); provider.setRegistry(registry); - + provider.setPortalAuthorizationManagerFactory(pamf); + // Keep track registrations.register(contentType, provider); Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-16 19:03:25 UTC (rev 7965) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-16 22:06:31 UTC (rev 7966) @@ -132,6 +132,7 @@ List dependencies = new ArrayList(); dependencies.add(contentProviderRegistryON); dependencies.add(instanceContainerON); + dependencies.add(pamfON); mbeanServer.invoke(scObjectName, "register", new Object[] {objectName, dependencies} , new String[] {"javax.management.ObjectName", "java.util.Collection"}); // Start the mbean @@ -164,8 +165,7 @@ // Stop the mbean MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); mbeanServer.invoke(scObjectName, "stop", new ObjectName[] {objectName} , new String[] {"javax.management.ObjectName"}); - - mbeanServer.unregisterMBean(objectName); + mbeanServer.invoke(scObjectName, "remove", new Object[] {objectName} , new String[] {"javax.management.ObjectName"}); } catch(Exception e) {

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7965 - trunk/core-admin.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2007-08-16 15:03:25 -0400 (Thu, 16 Aug 2007) New Revision: 7965 Modified: trunk/core-admin/build.xml Log: Make portal-admin tests dependent of JVM version used. Modified: trunk/core-admin/build.xml =================================================================== --- trunk/core-admin/build.xml 2007-08-16 18:21:55 UTC (rev 7964) +++ trunk/core-admin/build.xml 2007-08-16 19:03:25 UTC (rev 7965) @@ -101,7 +101,6 @@ <path refid="el.el.classpath"/> <path refid="jakarta.cactus.classpath"/> <path refid="junit.junit.classpath"/> - <path refid="jboss.jsfunit.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> </path> @@ -133,6 +132,7 @@ <call target="configure-defaults"/> <call target="configure-tools"/> <call target="configure-explode"/> + <call target="configure-jsfunit"/>   @@ -149,22 +149,6 @@ <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpathref="xmltask.xmltask.classpath"/> - <taskdef name="jsfunitwar" - classname="org.jboss.jsfunit.ant.JSFUnitWarTask"> - <classpath> - <fileset dir="${jboss.jsfunit.lib}"/> - - <fileset dir="${jakarta.cactus.lib}"/> - <fileset dir="${aspectj.aspectj.lib}"/> - <fileset dir="${nekohtml.nekohtml.lib}"/> - <fileset dir="${httpunit.httpunit.lib}"/> - <fileset dir="${jtidy.jtidy.lib}"/> - <fileset dir="${project.tools}/lib"> - <include name="*cargo**"/> - </fileset> - </classpath> - </taskdef> - </target> <path id="portal.task.classpath"> @@ -193,6 +177,24 @@ classpathref="explode.task.classpath"/> </target> + <target name="configure-jsfunit" if="HAVE_JDK_1.5"> + <taskdef name="jsfunitwar" + classname="org.jboss.jsfunit.ant.JSFUnitWarTask"> + <classpath> + <fileset dir="${jboss.jsfunit.lib}"/> + <fileset dir="${jakarta.cactus.lib}"/> + <fileset dir="${aspectj.aspectj.lib}"/> + <fileset dir="${nekohtml.nekohtml.lib}"/> + <fileset dir="${httpunit.httpunit.lib}"/> + <fileset dir="${jtidy.jtidy.lib}"/> + <fileset dir="${project.tools}/lib"> + <include name="*cargo**"/> + </fileset> + </classpath> + </taskdef> + </target> + +    @@ -203,12 +205,88 @@ <target name="compile" description="Compile all source files." - depends="_default:compile-classes, + depends="compile-classes, + compile-classes15, _default:compile-etc, _default:compile-resources">  </target> +  + <target name="compile-classes" depends="_buildmagic:init" unless="HAVE_JDK_1.5"> + <mkdir dir="${build.classes}"/> + +  + <mkdir dir="${build.gen.classes}"/> + +  + <depend srcdir="${source.java}:${build.gen.classes}" + destdir="${build.classes}" + dump="${javac.depend.dump}" + closure="${javac.depend.closure}"> + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + </depend> + + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}:${build.gen.classes}"/> + <classpath refid="javac.classpath"/> + + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + <exclude name="org/jboss/portal/test/**"/> + </javac> + </target> + +  + <target name="compile-classes15" depends="_buildmagic:init" if="HAVE_JDK_1.5"> + <mkdir dir="${build.classes}"/> + +  + <mkdir dir="${build.gen.classes}"/> + +  + <depend srcdir="${source.java}:${build.gen.classes}" + destdir="${build.classes}" + dump="${javac.depend.dump}" + closure="${javac.depend.closure}"> + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + </depend> + + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}:${build.gen.classes}"/> + <classpath refid="javac.classpath"/> + <classpath refid="jboss.jsfunit.classpath"/> + + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + </javac> + </target> + + + +    @@ -318,7 +396,7 @@ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-admin.sar"/> </target> - <target name="package-tests" depends="init, clean-tests"> + <target name="package-tests" depends="init, clean-tests" if="HAVE_JDK_1.5">  <jar jarfile="${build.lib}/portal-core-admin-test-lib.jar"> @@ -386,6 +464,10 @@ <target name="tests" depends="init" description="Runs the portal-admin tests"> <mkdir dir="${build.reports}"/> <mkdir dir="${test.reports}"/> + <call target="tests15"/> + </target> + + <target name="tests15" if="HAVE_JDK_1.5"> <deploy file="${jboss.portal-core.lib}/jboss-portal.sar" config="default"/> <deploy file="${build.lib}/portal-admin-test.sar" config="default"/> <junit printsummary="true" haltonerror="false" fork="true">

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7964 - trunk/core/src/main/org/jboss/portal/core/model/portal.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-08-16 14:21:55 -0400 (Thu, 16 Aug 2007) New Revision: 7964 Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java Log: Oups, jdk 5 code Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2007-08-16 18:11:39 UTC (rev 7963) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2007-08-16 18:21:55 UTC (rev 7964) @@ -427,12 +427,12 @@ protected String decodeName(String name) { - return name.replace("\\/", "/"); + return name.replaceAll("\\/", "/"); } protected String encodeName(String name) { - return name.replace("/", "\\/"); + return name.replaceAll("/", "\\/"); } } @@ -521,12 +521,12 @@ protected String decodeName(String name) { - return name.replace("\\.", "."); + return name.replaceAll("\\.", "."); } protected String encodeName(String name) { - return name.replace(".", "\\."); + return name.replaceAll(".", "\\."); } }

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7963 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-08-16 14:11:39 -0400 (Thu, 16 Aug 2007) New Revision: 7963 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java Log: Oups, jdk 5 code Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2007-08-16 16:51:00 UTC (rev 7962) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2007-08-16 18:11:39 UTC (rev 7963) @@ -427,12 +427,12 @@ protected String decodeName(String name) { - return name.replace("\\/", "/"); + return name.replaceAll("\\/", "/"); } protected String encodeName(String name) { - return name.replace("/", "\\/"); + return name.replaceAll("/", "\\/"); } } @@ -521,12 +521,12 @@ protected String decodeName(String name) { - return name.replace("\\.", "."); + return name.replaceAll("\\.", "."); } protected String encodeName(String name) { - return name.replace(".", "\\."); + return name.replaceAll(".", "\\."); } }

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7962 - modules/test/trunk/test.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-08-16 12:51:00 -0400 (Thu, 16 Aug 2007) New Revision: 7962 Modified: modules/test/trunk/test/build.xml Log: make the output put exported zips in the lib folder Modified: modules/test/trunk/test/build.xml =================================================================== --- modules/test/trunk/test/build.xml 2007-08-16 16:36:04 UTC (rev 7961) +++ modules/test/trunk/test/build.xml 2007-08-16 16:51:00 UTC (rev 7962) @@ -253,15 +253,15 @@ <copy todir="${module.output}/export/lib"> <fileset dir="${build.lib}"/> </copy> - <copy todir="${module.output}/export/resources"> - <fileset dir="${build.resources}/config" includes="*.xml"/> - </copy> - <zip file="${module.output}/export/resources/opends.zip"> + <zip file="${module.output}/export/lib/opends.zip"> <fileset dir="${build.resources}/config/opends"/> </zip> - <zip file="${module.output}/export/resources/ldap.zip"> + <zip file="${module.output}/export/lib/ldap.zip"> <fileset dir="${build.resources}/config/ldap"/> </zip> + <copy todir="${module.output}/export/resources"> + <fileset dir="${build.resources}/config" includes="*.xml"/> + </copy> </target>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r7961 - modules/test/trunk/test.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-08-16 12:36:04 -0400 (Thu, 16 Aug 2007) New Revision: 7961 Modified: modules/test/trunk/test/build.xml Log: zip opends and ldap content in the exported resource directory Modified: modules/test/trunk/test/build.xml =================================================================== --- modules/test/trunk/test/build.xml 2007-08-16 16:06:17 UTC (rev 7960) +++ modules/test/trunk/test/build.xml 2007-08-16 16:36:04 UTC (rev 7961) @@ -254,8 +254,14 @@ <fileset dir="${build.lib}"/> </copy> <copy todir="${module.output}/export/resources"> - <fileset dir="${build.resources}/config"/> + <fileset dir="${build.resources}/config" includes="*.xml"/> </copy> + <zip file="${module.output}/export/resources/opends.zip"> + <fileset dir="${build.resources}/config/opends"/> + </zip> + <zip file="${module.output}/export/resources/ldap.zip"> + <fileset dir="${build.resources}/config/ldap"/> + </zip> </target>

18 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits August 2007