You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/04/24 00:33:29 UTC
cvs commit: jakarta-jetspeed-2/components/file-cache project.xml maven.xml
weaver 2004/04/23 15:33:28
Modified: components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/pb
Tag: NANOCONTAINER_DEPLOYER PBStore.java
components/locator Tag: NANOCONTAINER_DEPLOYER project.xml
components/page-manager/src/java/org/apache/jetspeed/page/impl
Tag: NANOCONTAINER_DEPLOYER
CastorXmlPageManager.java
components/page-manager Tag: NANOCONTAINER_DEPLOYER
maven.xml project.xml .cvsignore
components/persistence Tag: NANOCONTAINER_DEPLOYER
project.xml .cvsignore
components/idgenerator Tag: NANOCONTAINER_DEPLOYER
project.xml
components/file-cache/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/file-cache/src/test/org/apache/jetspeed/cache/file
Tag: NANOCONTAINER_DEPLOYER TestFileCache.java
components/cm/src/java/org/apache/jetspeed/components Tag:
NANOCONTAINER_DEPLOYER
NanoDeployerBasedTestSuite.java
components/page-manager/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/otm
Tag: NANOCONTAINER_DEPLOYER OTMStoreImpl.java
components/file-cache Tag: NANOCONTAINER_DEPLOYER
project.xml maven.xml
Added: commons/src/java/org/apache/jetspeed/idgenerator Tag:
NANOCONTAINER_DEPLOYER IdGenerator.java
commons/src/java/org/apache/jetspeed/components/persistence/store
Tag: NANOCONTAINER_DEPLOYER
PersistenceStoreEventListener.java Transaction.java
TransactionEventListener.java PersistenceStore.java
PersistenceStoreInitializationException.java
LockFailedException.java TransactionEvent.java
PersistenceStoreEvent.java
PersistenceStoreContainer.java Filter.java
components/page-manager Tag: NANOCONTAINER_DEPLOYER
maven.log
commons/src/java/org/apache/jetspeed/cache/file Tag:
NANOCONTAINER_DEPLOYER FileCacheEventListener.java
FileCache.java FileCacheEntry.java
components/cm/src/java/org/apache/jetspeed/components Tag:
NANOCONTAINER_DEPLOYER DependencyAwareDeployer.java
components/idgenerator/src/java/org/apache/jetspeed/idgenerator/impl
Tag: NANOCONTAINER_DEPLOYER
JetspeedIdGenerator.java
components/file-cache/src/java/org/apache/jetspeed/cache/file/impl
Tag: NANOCONTAINER_DEPLOYER BaseFileCache.java
BaseFileCacheEntry.java
components/persistence/src/test/META-INF Tag:
NANOCONTAINER_DEPLOYER repository_test.xml
Removed: components/persistence/src/java/org/apache/jetspeed/components/persistence/store/impl
Tag: NANOCONTAINER_DEPLOYER
LockFailedException.java
components/file-cache/src/java/org/apache/jetspeed/cache/file
Tag: NANOCONTAINER_DEPLOYER FileCache.java
FileCacheEventListener.java FileCacheEntry.java
components/persistence/src/java/org/apache/jetspeed/components/persistence/store
Tag: NANOCONTAINER_DEPLOYER
PersistenceStoreEventListener.java
TransactionEvent.java Transaction.java
PersistenceStoreInitializationException.java
PersistenceStore.java
PersistenceStoreContainer.java
TransactionEventListener.java Filter.java
PersistenceStoreEvent.java
components/idgenerator/src/java/org/apache/jetspeed/idgenerator
Tag: NANOCONTAINER_DEPLOYER
JetspeedIdGenerator.java IdGenerator.java
Log:
- Moved certain api interfaces out of /components/* into /commons
- New implemenation of Deployer, DependencyAwareDeployer,
allows the packaging of jar dependencies within a component container's jar
to be added to that containers classloader
- preGoals for test jar:install now look for special properties "jar.bundle" and "component.only"
to correctly package component dependencies and to prevent JUnit tests from adding
components to the classpath while testing (component loading is handled by our specialized
test suite implementation).
- FileCache refactored to interface/implementation.
- components project.xmls modified to support the new component implenetation. This
also allowed me to clean-up alot of non-required dependencies from components.
Revision Changes Path
No revision
No revision
1.5.2.2 +1 -1 jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/pb/PBStore.java
Index: PBStore.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/pb/PBStore.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- PBStore.java 22 Apr 2004 21:09:53 -0000 1.5.2.1
+++ PBStore.java 23 Apr 2004 22:33:26 -0000 1.5.2.2
@@ -27,10 +27,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.persistence.store.Filter;
+import org.apache.jetspeed.components.persistence.store.LockFailedException;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.PersistenceStoreEventListener;
import org.apache.jetspeed.components.persistence.store.Transaction;
-import org.apache.jetspeed.components.persistence.store.impl.LockFailedException;
import org.apache.jetspeed.components.persistence.store.impl.StoreEventInvoker;
import org.apache.jetspeed.components.persistence.store.ojb.CriteriaFilter;
import org.apache.ojb.broker.Identity;
No revision
No revision
1.1.2.1 +35 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/idgenerator/Attic/IdGenerator.java
No revision
No revision
1.1.2.1 +47 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/PersistenceStoreEventListener.java
1.1.2.1 +45 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/Transaction.java
1.1.2.1 +43 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/TransactionEventListener.java
1.1.2.1 +143 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/PersistenceStore.java
1.1.2.1 +71 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/PersistenceStoreInitializationException.java
1.1.2.1 +71 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/LockFailedException.java
1.1.2.1 +32 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/TransactionEvent.java
1.1.2.1 +32 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/PersistenceStoreEvent.java
1.1.2.1 +35 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/PersistenceStoreContainer.java
1.1.2.1 +107 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/components/persistence/store/Attic/Filter.java
No revision
No revision
1.1.2.2 +1 -48 jakarta-jetspeed-2/components/locator/Attic/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/Attic/project.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.xml 20 Apr 2004 16:27:30 -0000 1.1.2.1
+++ project.xml 23 Apr 2004 22:33:27 -0000 1.1.2.2
@@ -37,100 +37,53 @@
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>junit</id>
<version>3.8.1</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>log4j</id>
<version>1.2.6</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>picocontainer</id>
<version>1.0-RC-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>nanocontainer</id>
<version>1.0-beta-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </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>asm</id>
<version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>groovy</id>
<version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>castor</id>
- <version>0.9.4.3</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>xerces</id>
<version>2.3.0</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
</dependencies>
<build>
No revision
No revision
1.1.2.4 +1 -2 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/CastorXmlPageManager.java
Index: CastorXmlPageManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/CastorXmlPageManager.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CastorXmlPageManager.java 22 Apr 2004 21:05:42 -0000 1.1.2.3
+++ CastorXmlPageManager.java 23 Apr 2004 22:33:27 -0000 1.1.2.4
@@ -23,7 +23,6 @@
import java.io.FileWriter;
import java.io.FilenameFilter;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
No revision
No revision
1.1.2.4 +3 -7 jakarta-jetspeed-2/components/page-manager/Attic/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/Attic/maven.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- maven.xml 22 Apr 2004 21:05:42 -0000 1.1.2.3
+++ maven.xml 23 Apr 2004 22:33:27 -0000 1.1.2.4
@@ -16,7 +16,8 @@
<project default="java:jar"
xmlns:j="jelly:core"
xmlns:define="jelly:define"
- xmlns:reactor="reactor">
+ xmlns:reactor="reactor"
+ xmlns:ant="jelly:ant">
<!--
<preGoal name="test:test">
@@ -53,11 +54,6 @@
<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" overwrite="true"/>
- <copy todir="${basedir}/target/deploy" file="${maven.repo.local}/jetspeed2/jars/jetspeed-persistence-2.0-a1-dev.jar" overwrite="true"/>
- <copy todir="${basedir}/target/deploy" file="${maven.repo.local}/jetspeed2/jars/jetspeed-file-cache-2.0-a1-dev.jar" overwrite="true"/>
- <copy todir="${basedir}/target/deploy" file="${maven.repo.local}/jetspeed2/jars/jetspeed-id-generator-2.0-a1-dev.jar" overwrite="true"/>
- </preGoal>
+
</project>
1.1.2.4 +20 -87 jakarta-jetspeed-2/components/page-manager/Attic/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/Attic/project.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- project.xml 22 Apr 2004 21:05:42 -0000 1.1.2.3
+++ project.xml 23 Apr 2004 22:33:27 -0000 1.1.2.4
@@ -37,133 +37,101 @@
<id>castor</id>
<version>0.9.4.3</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
+
<dependency>
<id>jetspeed-persistence</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
+ <component.only>true</component.only>
+ </properties>
</dependency>
+
<dependency>
<id>jetspeed-components</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>jetspeed2:jetspeed-id-generator</id>
<version>2.0-a1-dev</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
+ <component.only>true</component.only>
+ </properties>
</dependency>
<dependency>
<id>jetspeed2:jetspeed-file-cache</id>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
+ <properties>
+ <component.only>true</component.only>
+ </properties>
</dependency>
<!-- Testing only -->
<dependency>
<id>jetspeed2:jetspeed-rdbms</id>
<version>2.0-a1-dev</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
+ <component.only>true</component.only>
+ </properties>
</dependency>
-
- <dependency>
+ <dependency>
<id>commons-lang</id>
<version>2.0</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-beanutils</id>
<version>1.6.1</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</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>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<dependency>
-
<id>log4j</id>
<version>1.2.6</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
- </dependency>
+ </dependency>
+
<dependency>
<id>commons-collections</id>
<version>3.0</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-io</id>
<version>0.1</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.rc5-PATCHED</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<!--
@@ -216,13 +184,6 @@
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
- <dependency>
- <id>fulcrum</id>
- <version>3.0-b2-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
<!-- This is only a test dependency -->
<dependency>
<id>hsqldb</id>
@@ -288,34 +249,6 @@
<version>2.3</version>
<properties>
<war.bundle.jar>false</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>groovy</id>
- <version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>asm</id>
- <version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>jta</id>
- <jar>jta1.0.1.jar</jar>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>tyrex</id>
- <version>1.0.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
</dependencies>
1.1.2.2 +1 -0 jakarta-jetspeed-2/components/page-manager/Attic/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/Attic/.cvsignore,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- .cvsignore 20 Apr 2004 03:08:47 -0000 1.1.2.1
+++ .cvsignore 23 Apr 2004 22:33:27 -0000 1.1.2.2
@@ -1 +1,2 @@
target
+vfs_cache
No revision
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/Attic/.cvsignore,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- .cvsignore 20 Apr 2004 03:08:47 -0000 1.1.2.1
+++ .cvsignore 23 Apr 2004 22:33:27 -0000 1.1.2.2
@@ -1 +1,2 @@
target
+vfs_cache
No revision
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/Attic/.cvsignore,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- .cvsignore 20 Apr 2004 03:08:47 -0000 1.1.2.1
+++ .cvsignore 23 Apr 2004 22:33:27 -0000 1.1.2.2
@@ -1 +1,2 @@
target
+vfs_cache
1.1.2.3 +12 -9 jakarta-jetspeed-2/components/page-manager/Attic/maven.log
No revision
No revision
1.8.2.2 +15 -72 jakarta-jetspeed-2/components/persistence/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/project.xml,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- project.xml 19 Apr 2004 21:08:26 -0000 1.8.2.1
+++ project.xml 23 Apr 2004 22:33:27 -0000 1.8.2.2
@@ -36,104 +36,74 @@
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>jetspeed-commons</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<!-- testing only -->
<dependency>
<id>jetspeed-rdbms</id>
<groupId>jetspeed2</groupId>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>commons-lang</id>
<version>2.0</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</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>commons-beanutils</id>
<version>1.6.1</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>junit</id>
<version>3.8.1</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<dependency>
-
<id>log4j</id>
<version>1.2.6</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
-
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
- </dependency>
<dependency>
<id>commons-collections</id>
<version>3.0</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-io</id>
<version>0.1</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>ojb:db-ojb</id>
<version>1.0.rc5-PATCHED</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<!--
@@ -148,37 +118,38 @@
<id>commons-pool</id>
<version>1.1</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-dbcp</id>
<version>1.1</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>jdbc-se</id>
<jar>jdbc-se2.0.jar</jar>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <jar.bundle>false</jar.bundle>
</properties>
</dependency>
<dependency>
<id>xerces</id>
<version>2.3.0</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
+ <!--
<dependency>
<id>jdom</id>
<version>b8</version>
@@ -186,71 +157,43 @@
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
- <dependency>
- <id>fulcrum</id>
- <version>3.0-b2-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
+ -->
<!-- This is only a test dependency -->
<dependency>
<id>hsqldb</id>
<version>1.7.1</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>picocontainer</id>
<version>1.0-RC-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>nanocontainer</id>
<version>1.0-beta-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
- <dependency>
+ <dependency>
<id>groovy</id>
<version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>asm</id>
<version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>jta</id>
<jar>jta1.0.1.jar</jar>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
- <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
<version>1.0</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<!-- Testing only -->
<dependency>
<id>tyrex</id>
<version>1.0.1</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
</dependencies>
<build>
1.1.2.1 +1 -0 jakarta-jetspeed-2/components/persistence/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- .cvsignore 23 Feb 2004 01:12:43 -0000 1.1
+++ .cvsignore 23 Apr 2004 22:33:27 -0000 1.1.2.1
@@ -1,2 +1,3 @@
maven.log
target
+vfs_cache
No revision
No revision
1.1.2.2 +6 -50 jakarta-jetspeed-2/components/idgenerator/Attic/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/idgenerator/Attic/project.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.xml 20 Apr 2004 16:26:19 -0000 1.1.2.1
+++ project.xml 23 Apr 2004 22:33:27 -0000 1.1.2.2
@@ -33,104 +33,60 @@
</repository>
<dependencies>
+ <dependency>
+ <id>jetspeed2:jetspeed-commons</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
<dependency>
- <id>jetspeed-cm</id>
- <groupId>jetspeed2</groupId>
+ <id>jetspeed2:jetspeed-cm</id>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>junit</id>
<version>3.8.1</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>log4j</id>
<version>1.2.6</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>picocontainer</id>
<version>1.0-RC-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>nanocontainer</id>
<version>1.0-beta-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </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>asm</id>
<version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>groovy</id>
<version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>castor</id>
- <version>0.9.4.3</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>xerces</id>
<version>2.3.0</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
</dependencies>
<build>
No revision
No revision
1.1.2.1 +47 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/cache/file/Attic/FileCacheEventListener.java
1.1.2.1 +124 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/cache/file/Attic/FileCache.java
1.1.2.1 +73 -0 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/cache/file/Attic/FileCacheEntry.java
No revision
No revision
1.1.2.4 +3 -2 jakarta-jetspeed-2/components/file-cache/src/java/META-INF/Attic/nanocontainer.groovy
Index: nanocontainer.groovy
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/src/java/META-INF/Attic/nanocontainer.groovy,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- nanocontainer.groovy 22 Apr 2004 21:00:55 -0000 1.1.2.3
+++ nanocontainer.groovy 23 Apr 2004 22:33:28 -0000 1.1.2.4
@@ -16,6 +16,7 @@
import org.apache.jetspeed.components.ChildAwareContainer
import org.apache.jetspeed.cache.file.FileCache
+import org.apache.jetspeed.cache.file.impl.BaseFileCache
container = new ChildAwareContainer(parent)
@@ -27,11 +28,11 @@
if(initialCapacity != -1 && loadFactor != -1)
{
- FileCache fileCache = new FileCache(initialCapacity, loadFactor, scanRate, cacheSize)
+ FileCache fileCache = new BaseFileCache(initialCapacity, loadFactor, scanRate, cacheSize)
}
else
{
- FileCache fileCache = new FileCache(scanRate, cacheSize)
+ FileCache fileCache = new BaseFileCache(scanRate, cacheSize)
}
container.registerComponentInstance(FileCache, fileCache)
No revision
No revision
1.1.2.3 +2 -1 jakarta-jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/Attic/TestFileCache.java
Index: TestFileCache.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/Attic/TestFileCache.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TestFileCache.java 22 Apr 2004 21:02:07 -0000 1.1.2.2
+++ TestFileCache.java 23 Apr 2004 22:33:28 -0000 1.1.2.3
@@ -26,6 +26,7 @@
import org.apache.commons.io.StreamUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.jetspeed.cache.file.FileCache;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.picocontainer.MutablePicoContainer;
No revision
No revision
1.1.2.3 +37 -41 jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components/Attic/NanoDeployerBasedTestSuite.java
Index: NanoDeployerBasedTestSuite.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components/Attic/NanoDeployerBasedTestSuite.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NanoDeployerBasedTestSuite.java 22 Apr 2004 20:56:25 -0000 1.1.2.2
+++ NanoDeployerBasedTestSuite.java 23 Apr 2004 22:33:28 -0000 1.1.2.3
@@ -1,17 +1,17 @@
/*
* Copyright 2000-2004 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.jetspeed.components;
@@ -24,15 +24,13 @@
import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.VFS;
-import org.nanocontainer.deployer.NanoContainerDeployer;
import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.defaults.DefaultPicoContainer;
import org.picocontainer.defaults.SimpleReference;
/**
- *
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
- * @version $Id$
+ * @version $Id: NanoDeployerBasedTestSuite.java,v 1.1.2.2 2004/04/22 20:56:25
+ * weaver Exp $
*
*/
public class NanoDeployerBasedTestSuite extends TestSuite
@@ -41,7 +39,6 @@
private String[] applicationFolders;
private ComponentManager cm;
-
/**
*
*/
@@ -55,17 +52,17 @@
* @param arg0
* @param arg1
*/
- public NanoDeployerBasedTestSuite(Class arg0, String arg1)
+ public NanoDeployerBasedTestSuite( Class arg0, String arg1 )
{
super(arg0, arg1);
// TODO Auto-generated constructor stub
-
+
}
/**
* @param arg0
*/
- public NanoDeployerBasedTestSuite(Class arg0)
+ public NanoDeployerBasedTestSuite( Class arg0 )
{
super(arg0);
// TODO Auto-generated constructor stub
@@ -74,55 +71,54 @@
/**
* @param arg0
*/
- public NanoDeployerBasedTestSuite(String arg0)
+ public NanoDeployerBasedTestSuite( String arg0 )
{
super(arg0);
// TODO Auto-generated constructor stub
}
-
+
protected void buildContainer() throws Exception
{
- ArrayList containers = new ArrayList();
+ ArrayList containers = new ArrayList();
File deploy = new File("./target/deploy");
- if(deploy.exists())
+ if (deploy.exists())
{
File[] archives = deploy.listFiles();
- for(int i=0; i<archives.length; i++ )
+ for (int i = 0; i < archives.length; i++)
{
- containers.add("zip:/"+ archives[i].getAbsolutePath());
+ containers.add("zip:/" + archives[i].getAbsolutePath());
}
}
-
- containers.add(new File("./target/classes").toURL().toString());
-
+
+ containers.add(new File("./target/classes").toURL().toString());
+
setApplicationFolders((String[]) containers.toArray(new String[containers.size()]));
-
-
+
ClassLoader cl = Thread.currentThread().getContextClassLoader();
FileSystemManager fsManager = VFS.getManager();
- NanoContainerDeployer deployer = new NanoContainerDeployer(fsManager);
+ // NanoContainerDeployer deployer = new
+ // NanoContainerDeployer(fsManager);
+ DependencyAwareDeployer deployer = new DependencyAwareDeployer(fsManager);
MutablePicoContainer parent = new ChildAwareContainer();
SimpleReference parentRef = new SimpleReference();
parentRef.set(parent);
- for(int i=0; i < getApplicationFolders().length; i++)
+ for (int i = 0; i < getApplicationFolders().length; i++)
{
container = (MutablePicoContainer) deployer.deploy(fsManager.resolveFile(getApplicationFolders()[i]), cl, parentRef).get();
}
-
-
-
+
}
-
+
/*
* (non-Javadoc)
*
* @see junit.framework.Test#run(junit.framework.TestResult)
*/
- public void run(TestResult arg0)
+ public void run( TestResult arg0 )
{
try
{
-
+
buildContainer();
super.run(arg0);
if (container != null)
@@ -136,10 +132,10 @@
{
container.stop();
}
-
+
e.printStackTrace();
-
- throw new RuntimeException(e);
+
+ throw new RuntimeException(e);
}
}
@@ -149,7 +145,7 @@
* @see junit.framework.TestSuite#runTest(junit.framework.Test,
* junit.framework.TestResult)
*/
- public void runTest(Test arg0, TestResult arg1)
+ public void runTest( Test arg0, TestResult arg1 )
{
// TODO Auto-generated method stub
if (arg0 instanceof AbstractComponentAwareTestCase)
@@ -172,8 +168,8 @@
* @param script
* The script to set.
*/
- public void setApplicationFolders(String[] appFolders)
+ public void setApplicationFolders( String[] appFolders )
{
this.applicationFolders = appFolders;
}
-}
+}
\ No newline at end of file
No revision
Index: NanoDeployerBasedTestSuite.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components/Attic/NanoDeployerBasedTestSuite.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NanoDeployerBasedTestSuite.java 22 Apr 2004 20:56:25 -0000 1.1.2.2
+++ NanoDeployerBasedTestSuite.java 23 Apr 2004 22:33:28 -0000 1.1.2.3
@@ -1,17 +1,17 @@
/*
* Copyright 2000-2004 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.jetspeed.components;
@@ -24,15 +24,13 @@
import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.VFS;
-import org.nanocontainer.deployer.NanoContainerDeployer;
import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.defaults.DefaultPicoContainer;
import org.picocontainer.defaults.SimpleReference;
/**
- *
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
- * @version $Id$
+ * @version $Id: NanoDeployerBasedTestSuite.java,v 1.1.2.2 2004/04/22 20:56:25
+ * weaver Exp $
*
*/
public class NanoDeployerBasedTestSuite extends TestSuite
@@ -41,7 +39,6 @@
private String[] applicationFolders;
private ComponentManager cm;
-
/**
*
*/
@@ -55,17 +52,17 @@
* @param arg0
* @param arg1
*/
- public NanoDeployerBasedTestSuite(Class arg0, String arg1)
+ public NanoDeployerBasedTestSuite( Class arg0, String arg1 )
{
super(arg0, arg1);
// TODO Auto-generated constructor stub
-
+
}
/**
* @param arg0
*/
- public NanoDeployerBasedTestSuite(Class arg0)
+ public NanoDeployerBasedTestSuite( Class arg0 )
{
super(arg0);
// TODO Auto-generated constructor stub
@@ -74,55 +71,54 @@
/**
* @param arg0
*/
- public NanoDeployerBasedTestSuite(String arg0)
+ public NanoDeployerBasedTestSuite( String arg0 )
{
super(arg0);
// TODO Auto-generated constructor stub
}
-
+
protected void buildContainer() throws Exception
{
- ArrayList containers = new ArrayList();
+ ArrayList containers = new ArrayList();
File deploy = new File("./target/deploy");
- if(deploy.exists())
+ if (deploy.exists())
{
File[] archives = deploy.listFiles();
- for(int i=0; i<archives.length; i++ )
+ for (int i = 0; i < archives.length; i++)
{
- containers.add("zip:/"+ archives[i].getAbsolutePath());
+ containers.add("zip:/" + archives[i].getAbsolutePath());
}
}
-
- containers.add(new File("./target/classes").toURL().toString());
-
+
+ containers.add(new File("./target/classes").toURL().toString());
+
setApplicationFolders((String[]) containers.toArray(new String[containers.size()]));
-
-
+
ClassLoader cl = Thread.currentThread().getContextClassLoader();
FileSystemManager fsManager = VFS.getManager();
- NanoContainerDeployer deployer = new NanoContainerDeployer(fsManager);
+ // NanoContainerDeployer deployer = new
+ // NanoContainerDeployer(fsManager);
+ DependencyAwareDeployer deployer = new DependencyAwareDeployer(fsManager);
MutablePicoContainer parent = new ChildAwareContainer();
SimpleReference parentRef = new SimpleReference();
parentRef.set(parent);
- for(int i=0; i < getApplicationFolders().length; i++)
+ for (int i = 0; i < getApplicationFolders().length; i++)
{
container = (MutablePicoContainer) deployer.deploy(fsManager.resolveFile(getApplicationFolders()[i]), cl, parentRef).get();
}
-
-
-
+
}
-
+
/*
* (non-Javadoc)
*
* @see junit.framework.Test#run(junit.framework.TestResult)
*/
- public void run(TestResult arg0)
+ public void run( TestResult arg0 )
{
try
{
-
+
buildContainer();
super.run(arg0);
if (container != null)
@@ -136,10 +132,10 @@
{
container.stop();
}
-
+
e.printStackTrace();
-
- throw new RuntimeException(e);
+
+ throw new RuntimeException(e);
}
}
@@ -149,7 +145,7 @@
* @see junit.framework.TestSuite#runTest(junit.framework.Test,
* junit.framework.TestResult)
*/
- public void runTest(Test arg0, TestResult arg1)
+ public void runTest( Test arg0, TestResult arg1 )
{
// TODO Auto-generated method stub
if (arg0 instanceof AbstractComponentAwareTestCase)
@@ -172,8 +168,8 @@
* @param script
* The script to set.
*/
- public void setApplicationFolders(String[] appFolders)
+ public void setApplicationFolders( String[] appFolders )
{
this.applicationFolders = appFolders;
}
-}
+}
\ No newline at end of file
No revision
Index: NanoDeployerBasedTestSuite.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components/Attic/NanoDeployerBasedTestSuite.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NanoDeployerBasedTestSuite.java 22 Apr 2004 20:56:25 -0000 1.1.2.2
+++ NanoDeployerBasedTestSuite.java 23 Apr 2004 22:33:28 -0000 1.1.2.3
@@ -1,17 +1,17 @@
/*
* Copyright 2000-2004 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.jetspeed.components;
@@ -24,15 +24,13 @@
import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.VFS;
-import org.nanocontainer.deployer.NanoContainerDeployer;
import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.defaults.DefaultPicoContainer;
import org.picocontainer.defaults.SimpleReference;
/**
- *
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
- * @version $Id$
+ * @version $Id: NanoDeployerBasedTestSuite.java,v 1.1.2.2 2004/04/22 20:56:25
+ * weaver Exp $
*
*/
public class NanoDeployerBasedTestSuite extends TestSuite
@@ -41,7 +39,6 @@
private String[] applicationFolders;
private ComponentManager cm;
-
/**
*
*/
@@ -55,17 +52,17 @@
* @param arg0
* @param arg1
*/
- public NanoDeployerBasedTestSuite(Class arg0, String arg1)
+ public NanoDeployerBasedTestSuite( Class arg0, String arg1 )
{
super(arg0, arg1);
// TODO Auto-generated constructor stub
-
+
}
/**
* @param arg0
*/
- public NanoDeployerBasedTestSuite(Class arg0)
+ public NanoDeployerBasedTestSuite( Class arg0 )
{
super(arg0);
// TODO Auto-generated constructor stub
@@ -74,55 +71,54 @@
/**
* @param arg0
*/
- public NanoDeployerBasedTestSuite(String arg0)
+ public NanoDeployerBasedTestSuite( String arg0 )
{
super(arg0);
// TODO Auto-generated constructor stub
}
-
+
protected void buildContainer() throws Exception
{
- ArrayList containers = new ArrayList();
+ ArrayList containers = new ArrayList();
File deploy = new File("./target/deploy");
- if(deploy.exists())
+ if (deploy.exists())
{
File[] archives = deploy.listFiles();
- for(int i=0; i<archives.length; i++ )
+ for (int i = 0; i < archives.length; i++)
{
- containers.add("zip:/"+ archives[i].getAbsolutePath());
+ containers.add("zip:/" + archives[i].getAbsolutePath());
}
}
-
- containers.add(new File("./target/classes").toURL().toString());
-
+
+ containers.add(new File("./target/classes").toURL().toString());
+
setApplicationFolders((String[]) containers.toArray(new String[containers.size()]));
-
-
+
ClassLoader cl = Thread.currentThread().getContextClassLoader();
FileSystemManager fsManager = VFS.getManager();
- NanoContainerDeployer deployer = new NanoContainerDeployer(fsManager);
+ // NanoContainerDeployer deployer = new
+ // NanoContainerDeployer(fsManager);
+ DependencyAwareDeployer deployer = new DependencyAwareDeployer(fsManager);
MutablePicoContainer parent = new ChildAwareContainer();
SimpleReference parentRef = new SimpleReference();
parentRef.set(parent);
- for(int i=0; i < getApplicationFolders().length; i++)
+ for (int i = 0; i < getApplicationFolders().length; i++)
{
container = (MutablePicoContainer) deployer.deploy(fsManager.resolveFile(getApplicationFolders()[i]), cl, parentRef).get();
}
-
-
-
+
}
-
+
/*
* (non-Javadoc)
*
* @see junit.framework.Test#run(junit.framework.TestResult)
*/
- public void run(TestResult arg0)
+ public void run( TestResult arg0 )
{
try
{
-
+
buildContainer();
super.run(arg0);
if (container != null)
@@ -136,10 +132,10 @@
{
container.stop();
}
-
+
e.printStackTrace();
-
- throw new RuntimeException(e);
+
+ throw new RuntimeException(e);
}
}
@@ -149,7 +145,7 @@
* @see junit.framework.TestSuite#runTest(junit.framework.Test,
* junit.framework.TestResult)
*/
- public void runTest(Test arg0, TestResult arg1)
+ public void runTest( Test arg0, TestResult arg1 )
{
// TODO Auto-generated method stub
if (arg0 instanceof AbstractComponentAwareTestCase)
@@ -172,8 +168,8 @@
* @param script
* The script to set.
*/
- public void setApplicationFolders(String[] appFolders)
+ public void setApplicationFolders( String[] appFolders )
{
this.applicationFolders = appFolders;
}
-}
+}
\ No newline at end of file
1.1.2.1 +133 -0 jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components/Attic/DependencyAwareDeployer.java
No revision
No revision
1.1.2.5 +1 -2 jakarta-jetspeed-2/components/page-manager/src/java/META-INF/Attic/nanocontainer.groovy
Index: nanocontainer.groovy
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/META-INF/Attic/nanocontainer.groovy,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- nanocontainer.groovy 22 Apr 2004 21:05:42 -0000 1.1.2.4
+++ nanocontainer.groovy 23 Apr 2004 22:33:28 -0000 1.1.2.5
@@ -23,8 +23,7 @@
import org.apache.jetspeed.page.PageManager
import org.apache.jetspeed.page.impl.CastorXmlPageManager
import org.apache.jetspeed.cache.file.FileCache
-import org.apache.jetspeed.profiler.Profiler
-import org.apache.jetspeed.profiler.impl.JetspeedProfiler
+
import java.io.File
No revision
No revision
1.1.2.1 +95 -0 jakarta-jetspeed-2/components/idgenerator/src/java/org/apache/jetspeed/idgenerator/impl/Attic/JetspeedIdGenerator.java
No revision
No revision
1.1.2.1 +407 -0 jakarta-jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/impl/Attic/BaseFileCache.java
1.1.2.1 +139 -0 jakarta-jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/impl/Attic/BaseFileCacheEntry.java
No revision
No revision
1.6.2.1 +1 -1 jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/otm/OTMStoreImpl.java
Index: OTMStoreImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/otm/OTMStoreImpl.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- OTMStoreImpl.java 4 Mar 2004 21:20:07 -0000 1.6
+++ OTMStoreImpl.java 23 Apr 2004 22:33:28 -0000 1.6.2.1
@@ -23,11 +23,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.persistence.store.Filter;
+import org.apache.jetspeed.components.persistence.store.LockFailedException;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.PersistenceStoreEventListener;
import org.apache.jetspeed.components.persistence.store.Transaction;
import org.apache.jetspeed.components.persistence.store.TransactionEventListener;
-import org.apache.jetspeed.components.persistence.store.impl.LockFailedException;
import org.apache.jetspeed.components.persistence.store.impl.StoreEventInvoker;
import org.apache.jetspeed.components.persistence.store.ojb.CriteriaFilter;
import org.apache.ojb.broker.Identity;
No revision
No revision
1.1.2.1 +80 -0 jakarta-jetspeed-2/components/persistence/src/test/META-INF/Attic/repository_test.xml
No revision
No revision
1.1.2.2 +9 -39 jakarta-jetspeed-2/components/file-cache/Attic/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/Attic/project.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.xml 20 Apr 2004 19:43:13 -0000 1.1.2.1
+++ project.xml 23 Apr 2004 22:33:28 -0000 1.1.2.2
@@ -34,103 +34,73 @@
<dependencies>
<dependency>
- <id>jetspeed-cm</id>
- <groupId>jetspeed2</groupId>
+ <id>jetspeed2:jetspeed-cm</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-io</id>
<version>0.1</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>commons-lang</id>
<version>2.0</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <jar.bundle>true</jar.bundle>
</properties>
</dependency>
<dependency>
<id>junit</id>
<version>3.8.1</version>
- <properties>
- <war.bundle.jar>false</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>log4j</id>
<version>1.2.6</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>picocontainer</id>
<version>1.0-RC-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>nanocontainer</id>
<version>1.0-beta-1-SNAPSHOT</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </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>asm</id>
<version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>groovy</id>
- <version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
+ <version>1.0-beta-4-snapshot</version>
</dependency>
<dependency>
<id>xerces</id>
<version>2.3.0</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
</dependency>
</dependencies>
<build>
1.1.2.2 +15 -2 jakarta-jetspeed-2/components/file-cache/Attic/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/Attic/maven.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- maven.xml 20 Apr 2004 19:43:13 -0000 1.1.2.1
+++ maven.xml 23 Apr 2004 22:33:28 -0000 1.1.2.2
@@ -16,7 +16,8 @@
<project default="java:jar"
xmlns:j="jelly:core"
xmlns:define="jelly:define"
- xmlns:reactor="reactor">
+ xmlns:reactor="reactor"
+ xmlns:ant="jelly:ant">
<!-- Target of maven test:single test -->
<property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator'/>
@@ -25,5 +26,17 @@
<attainGoal name="jar:install"/>
<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
-
+
+ <!--
+ <preGoal name="jar:jar">
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.getProperty('jar.bundle')=='true'}">
+ <j:if test="${dep.type =='jar'}">
+ <ant:copy todir="${maven.build.dest}/lib" file="${lib.path}"/>
+ </j:if>
+ </j:if>
+ </j:forEach>
+ </preGoal>
+ -->
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org