weaver 2004/04/19 14:09:08
Modified: components/security Tag: NANOCONTAINER_DEPLOYER
project.properties project.xml
components/rdbms/src/java/org/apache/jetspeed/containers
Tag: NANOCONTAINER_DEPLOYER rdbms.container.groovy
cps Tag: NANOCONTAINER_DEPLOYER project.properties
project.xml
portal Tag: NANOCONTAINER_DEPLOYER project.xml
project.properties
components/registry Tag: NANOCONTAINER_DEPLOYER project.xml
project.properties maven.xml
portal/src/webapp/WEB-INF/assembly Tag:
NANOCONTAINER_DEPLOYER jetspeed.groovy
components/registry/src/test/org/apache/jetspeed/components/portletregistry
Tag: NANOCONTAINER_DEPLOYER
TestRegistryDirectPart2.java
TestRegistryDirect.java
components/security/src/java/org/apache/jetspeed/security/containers
Tag: NANOCONTAINER_DEPLOYER
security.container.groovy
components/rdbms/src/test/org/apache/jetspeed/components
Tag: NANOCONTAINER_DEPLOYER TestRDBMS.java
components/registry/src/test/org/apache/jetspeed/components/portletentity
Tag: NANOCONTAINER_DEPLOYER
TestPortletEntityAccessComponent.java
Added: portal/test/testdata/psml/user/cachetest Tag:
NANOCONTAINER_DEPLOYER .cvsignore
components/registry/src/java/org/apache/jetspeed/components/portletregistry
Tag: NANOCONTAINER_DEPLOYER
PortletRegistryComponentImpl.groovy
components/registry/src/java/org/apache/jetspeed/components/portletentity
Tag: NANOCONTAINER_DEPLOYER
PortletEntityAccessComponentImpl.groovy
components/rdbms/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/registry/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
Log:
starting new branch for using nano deployer
Revision Changes Path
No revision
No revision
1.5.2.1 +1 -1 jakarta-jetspeed-2/components/security/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/project.properties,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.properties 29 Mar 2004 04:55:11 -0000 1.5
+++ project.properties 19 Apr 2004 21:09:06 -0000 1.5.2.1
@@ -13,7 +13,7 @@
# limitations under the License.
# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+maven.repo.remote = http://www.bluesunrise.com/maven/,
http://www.ibiblio.org/maven/,http://dist.codehaus.org
# Display the date on the Maven web site
maven.xdoc.date = left
1.5.2.1 +1 -1 jakarta-jetspeed-2/components/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.xml 29 Mar 2004 04:55:11 -0000 1.5
+++ project.xml 19 Apr 2004 21:09:06 -0000 1.5.2.1
@@ -224,7 +224,7 @@
</dependency>
<dependency>
<id>picocontainer</id>
- <version>1.0-beta-5-SNAPSHOT</version>
+ <version>1.0-RC-1-SNAPSHOT</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
No revision
No revision
1.7.2.1 +3 -2
jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers/rdbms.container.groovy
Index: rdbms.container.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers/rdbms.container.groovy,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- rdbms.container.groovy 9 Mar 2004 16:17:02 -0000 1.7
+++ rdbms.container.groovy 19 Apr 2004 21:09:06 -0000 1.7.2.1
@@ -9,8 +9,9 @@
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.ComponentAdapter
-import org.picocontainer.defaults.ConstructorComponentAdapter
+import org.picocontainer.defaults.ConstructorInjectionComponentAdapter
import java.io.File
+import org.apache.jetspeed.components.MultiStartPicoContainerWrapper
// WARNING!!!!!!
// DO NOT use {Class}.class as it appears to be broken in Groovy
@@ -40,4 +41,4 @@
-return container
\ No newline at end of file
+return new MultiStartPicoContainerWrapper(container)
\ No newline at end of file
No revision
No revision
1.6.2.1 +1 -1 jakarta-jetspeed-2/cps/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/project.properties,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- project.properties 31 Mar 2004 11:26:37 -0000 1.6
+++ project.properties 19 Apr 2004 21:09:06 -0000 1.6.2.1
@@ -13,7 +13,7 @@
# limitations under the License.
# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+maven.repo.remote = http://www.bluesunrise.com/maven/,
http://www.ibiblio.org/maven/,http://dist.codehaus.org
# Display the date on the Maven web site
maven.xdoc.date = left
1.18.2.1 +1 -1 jakarta-jetspeed-2/cps/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/project.xml,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- project.xml 31 Mar 2004 11:26:37 -0000 1.18
+++ project.xml 19 Apr 2004 21:09:06 -0000 1.18.2.1
@@ -128,7 +128,7 @@
</dependency>
<dependency>
<id>picocontainer</id>
- <version>1.0-beta-5-SNAPSHOT</version>
+ <version>1.0-RC-1-SNAPSHOT/version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
No revision
No revision
1.56.2.1 +1 -1 jakarta-jetspeed-2/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.56
retrieving revision 1.56.2.1
diff -u -r1.56 -r1.56.2.1
--- project.xml 6 Apr 2004 01:19:55 -0000 1.56
+++ project.xml 19 Apr 2004 21:09:06 -0000 1.56.2.1
@@ -89,7 +89,7 @@
<dependency>
<id>picocontainer</id>
- <version>1.0-beta-5-SNAPSHOT</version>
+ <version>1.0-RC-1-SNAPSHOT</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
1.10.2.1 +1 -1 jakarta-jetspeed-2/portal/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.properties,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- project.properties 3 Apr 2004 03:49:46 -0000 1.10
+++ project.properties 19 Apr 2004 21:09:07 -0000 1.10.2.1
@@ -13,7 +13,7 @@
# limitations under the License.
# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+maven.repo.remote = http://www.bluesunrise.com/maven/,
http://www.ibiblio.org/maven/,http://dist.codehaus.org
# Display the date on the Maven web site
maven.xdoc.date = left
No revision
No revision
1.1.2.1 +1 -0
jakarta-jetspeed-2/portal/test/testdata/psml/user/cachetest/Attic/.cvsignore
No revision
No revision
1.1.2.1 +27 -0
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/Attic/PortletRegistryComponentImpl.groovy
No revision
No revision
1.10.2.1 +15 -1 jakarta-jetspeed-2/components/registry/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- project.xml 29 Mar 2004 04:54:50 -0000 1.10
+++ project.xml 19 Apr 2004 21:09:07 -0000 1.10.2.1
@@ -80,6 +80,20 @@
</properties>
</dependency>
<dependency>
+ <id>commons-vfs</id>
+ <version>SNAPSHOT</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>nanocontainer:nanocontainer-deployer</id>
+ <version>1.0-beta-1-SNAPSHOT</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
<id>junit</id>
<version>3.8.1</version>
<properties>
@@ -190,7 +204,7 @@
</dependency>
<dependency>
<id>picocontainer</id>
- <version>1.0-beta-5-SNAPSHOT</version>
+ <version>1.0-RC-1-SNAPSHOT</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
1.5.2.1 +4 -2 jakarta-jetspeed-2/components/registry/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.properties,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.properties 29 Mar 2004 04:54:50 -0000 1.5
+++ project.properties 19 Apr 2004 21:09:07 -0000 1.5.2.1
@@ -13,7 +13,7 @@
# limitations under the License.
# Remote repos
-maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+maven.repo.remote = http://www.bluesunrise.com/maven/,
http://www.ibiblio.org/maven/,http://dist.codehaus.org
# Display the date on the Maven web site
maven.xdoc.date = left
@@ -50,4 +50,6 @@
org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password =
\ No newline at end of file
+org.apache.jetspeed.database.password =
+
+maven.junit.fork=true
\ No newline at end of file
1.13.2.1 +5 -0 jakarta-jetspeed-2/components/registry/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/maven.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- maven.xml 18 Mar 2004 14:38:51 -0000 1.13
+++ maven.xml 19 Apr 2004 21:09:07 -0000 1.13.2.1
@@ -52,5 +52,10 @@
<attainGoal name="ojb.registry"/>
<attainGoal name="jar:install"/>
</goal>
+
+ <preGoal name="test:test">
+ <copy todir="${basedir}/target/deploy"
file="${maven.repo.local}/jetspeed2/jars/jetspeed-rdbms-2.0-a1-dev.jar" />
+ <copy todir="${basedir}/target/deploy"
file="${maven.repo.local}/jetspeed2/jars/jetspeed-persistence-2.0-a1-dev.jar" />
+ </preGoal>
</project>
No revision
No revision
1.30.2.1 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy
Index: jetspeed.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -r1.30 -r1.30.2.1
--- jetspeed.groovy 7 Apr 2004 00:48:46 -0000 1.30
+++ jetspeed.groovy 19 Apr 2004 21:09:07 -0000 1.30.2.1
@@ -16,7 +16,7 @@
import org.picocontainer.defaults.DefaultPicoContainer
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.ComponentAdapter
-import org.picocontainer.defaults.ConstructorComponentAdapter
+import org.picocontainer.defaults.ConstructorInjectionComponentAdapter
import org.picocontainer.Parameter
import org.picocontainer.defaults.ComponentParameter
import org.apache.jetspeed.locator.JetspeedTemplateLocator
No revision
No revision
1.6.2.1 +5 -5
jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryDirectPart2.java
Index: TestRegistryDirectPart2.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryDirectPart2.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- TestRegistryDirectPart2.java 18 Mar 2004 06:09:34 -0000 1.6
+++ TestRegistryDirectPart2.java 19 Apr 2004 21:09:07 -0000 1.6.2.1
@@ -20,11 +20,10 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.components.persistence.store.Filter;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.impl.LockFailedException;
-import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.impl.DublinCoreImpl;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
@@ -95,8 +94,9 @@
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRegistryDirectPart2.class);
- suite.setScript("org/apache/jetspeed/containers/test.registry.groovy");
+ // ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRegistryDirectPart2.class);
+ // suite.setScript("org/apache/jetspeed/containers/test.registry.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestRegistryDirectPart2.class);
return suite;
}
1.5.2.1 +5 -5
jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryDirect.java
Index: TestRegistryDirect.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryDirect.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- TestRegistryDirect.java 11 Mar 2004 19:16:35 -0000 1.5
+++ TestRegistryDirect.java 19 Apr 2004 21:09:07 -0000 1.5.2.1
@@ -22,12 +22,11 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.components.persistence.store.Filter;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.impl.LockFailedException;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
-import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.om.common.DublinCore;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.impl.DublinCoreImpl;
@@ -103,8 +102,9 @@
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRegistryDirect.class);
- suite.setScript("org/apache/jetspeed/containers/test.registry.groovy");
+ // ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRegistryDirect.class);
+ // suite.setScript("org/apache/jetspeed/containers/test.registry.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestRegistryDirect.class);
return suite;
}
No revision
No revision
1.4.2.1 +1 -1
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/containers/security.container.groovy
Index: security.container.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/containers/security.container.groovy,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- security.container.groovy 18 Mar 2004 19:33:24 -0000 1.4
+++ security.container.groovy 19 Apr 2004 21:09:07 -0000 1.4.2.1
@@ -18,7 +18,7 @@
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.defaults.ComponentParameter
-import org.picocontainer.defaults.ConstructorComponentAdapter
+import org.picocontainer.defaults.ConstructorInjectionComponentAdapter
import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
No revision
No revision
1.1.2.1 +27 -0
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/Attic/PortletEntityAccessComponentImpl.groovy
No revision
No revision
1.1.2.1 +36 -0
jakarta-jetspeed-2/components/rdbms/src/java/META-INF/Attic/nanocontainer.groovy
No revision
No revision
1.1.2.1 +60 -0
jakarta-jetspeed-2/components/registry/src/java/META-INF/Attic/nanocontainer.groovy
No revision
No revision
1.5.2.1 +9 -4
jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java
Index: TestRDBMS.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- TestRDBMS.java 9 Mar 2004 16:18:24 -0000 1.5
+++ TestRDBMS.java 19 Apr 2004 21:09:07 -0000 1.5.2.1
@@ -14,6 +14,7 @@
* limitations under the License.
*/
package org.apache.jetspeed.components;
+import java.io.File;
import java.sql.Connection;
import javax.sql.DataSource;
@@ -34,12 +35,15 @@
*/
public class TestRDBMS extends AbstractComponentAwareTestCase
{
- public static Test suite()
+ public static Test suite() throws Exception
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRDBMS.class);
- suite.setScript("org/apache/jetspeed/containers/rdbms.container.groovy");
+ //ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRDBMS.class);
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestRDBMS.class);
+ // suite.setScript("org/apache/jetspeed/containers/rdbms.container.groovy");
+ suite.setApplicationFolders(new String[] {new
File("./target/classes").toURL().toString()});
return suite;
}
+
/**
* Defines the testcase name for JUnit.
*
@@ -54,7 +58,8 @@
public void testDBCP_1() throws Exception
{
assertTrue(DatasourceComponent.class.isAssignableFrom(DBCPDatasourceComponent.class));
- MutablePicoContainer defaultContainer =
getComponentManager().getRootContainer();
+ // MutablePicoContainer defaultContainer =
getComponentManager().getRootContainer();
+ MutablePicoContainer defaultContainer = getContainer();
DatasourceComponent dsc = (DatasourceComponent) defaultContainer
.getComponentInstance(DatasourceComponent.class);
assertNotNull(dsc);
No revision
No revision
1.3.2.1 +6 -4
jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityAccessComponent.java
Index: TestPortletEntityAccessComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityAccessComponent.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TestPortletEntityAccessComponent.java 31 Mar 2004 19:34:20 -0000 1.3
+++ TestPortletEntityAccessComponent.java 19 Apr 2004 21:09:08 -0000 1.3.2.1
@@ -21,7 +21,7 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
@@ -79,8 +79,10 @@
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPortletEntityAccessComponent.class);
- suite.setScript("org/apache/jetspeed/containers/test-entity.groovy");
+ //ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPortletEntityAccessComponent.class);
+ //suite.setScript("org/apache/jetspeed/containers/test-entity.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestPortletEntityAccessComponent.class);
+
return suite;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
