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/22 23:05:42 UTC
cvs commit: jakarta-jetspeed-2/components/page-manager/src/test Log4j.properties
weaver 2004/04/22 14:05:42
Modified: components/page-manager/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/page-manager Tag: NANOCONTAINER_DEPLOYER
project.properties project.xml maven.xml
components/page-manager/src/java/org/apache/jetspeed/page/impl
Tag: NANOCONTAINER_DEPLOYER
CastorXmlPageManager.java
Added: components/page-manager/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER page-mapping.xml
components/page-manager/WEB-INF/pages Tag:
NANOCONTAINER_DEPLOYER default-page.psml
test001.psml
components/page-manager/src/test Tag: NANOCONTAINER_DEPLOYER
Log4j.properties
Removed: components/page-manager/testdata/pages Tag:
NANOCONTAINER_DEPLOYER default-page.psml
test001.psml
components/page-manager/src/java/org/apache/jetspeed/page/impl
Tag: NANOCONTAINER_DEPLOYER page-mapping.xml
Log:
- Uses ChildAwareContainer
- Added deployment to test:test pre-goal
- changed location of test data
Revision Changes Path
No revision
No revision
1.1.2.4 +6 -9 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- nanocontainer.groovy 20 Apr 2004 22:38:50 -0000 1.1.2.3
+++ nanocontainer.groovy 22 Apr 2004 21:05:42 -0000 1.1.2.4
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import org.picocontainer.defaults.DefaultPicoContainer
+import org.apache.jetspeed.components.ChildAwareContainer
import org.picocontainer.ComponentAdapter
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
@@ -31,17 +31,14 @@
import java.util.Properties
applicationRoot = System.getProperty("org.apache.jetspeed.application_root", "./")
+pageRoot = System.getProperty("org.apache.jetspeed.page_root", "/WEB-INF/pages")
-container = new DefaultPicoContainer()
+container = new ChildAwareContainer(parent)
-root = applicationRoot + "/testdata/pages"
-Long scanRate = 120
-cacheSize = 100
-// fileCache = new FileCache(scanRate, cacheSize)
-pageManager = new CastorXmlPageManager(parent.getComponentInstance("IdGenerator"), parent.getComponentInstance(FileCache), root)
-container.registerComponentInstance(PageManager, pageManager)
-// container.registerComponentImplementation(PageManager, CastorXmlPageManager, new Parameter[] {new ComponentParameter("IdGenerator"), new ComponentParameter(FileCache), new ConstantParameter(root)})
+root = applicationRoot + pageRoot
+
+container.registerComponentImplementation(PageManager, CastorXmlPageManager, new Parameter[] {new ComponentParameter("IdGenerator"), new ComponentParameter(FileCache), new ConstantParameter(root)})
return container
No revision
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- nanocontainer.groovy 20 Apr 2004 22:38:50 -0000 1.1.2.3
+++ nanocontainer.groovy 22 Apr 2004 21:05:42 -0000 1.1.2.4
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import org.picocontainer.defaults.DefaultPicoContainer
+import org.apache.jetspeed.components.ChildAwareContainer
import org.picocontainer.ComponentAdapter
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
@@ -31,17 +31,14 @@
import java.util.Properties
applicationRoot = System.getProperty("org.apache.jetspeed.application_root", "./")
+pageRoot = System.getProperty("org.apache.jetspeed.page_root", "/WEB-INF/pages")
-container = new DefaultPicoContainer()
+container = new ChildAwareContainer(parent)
-root = applicationRoot + "/testdata/pages"
-Long scanRate = 120
-cacheSize = 100
-// fileCache = new FileCache(scanRate, cacheSize)
-pageManager = new CastorXmlPageManager(parent.getComponentInstance("IdGenerator"), parent.getComponentInstance(FileCache), root)
-container.registerComponentInstance(PageManager, pageManager)
-// container.registerComponentImplementation(PageManager, CastorXmlPageManager, new Parameter[] {new ComponentParameter("IdGenerator"), new ComponentParameter(FileCache), new ConstantParameter(root)})
+root = applicationRoot + pageRoot
+
+container.registerComponentImplementation(PageManager, CastorXmlPageManager, new Parameter[] {new ComponentParameter("IdGenerator"), new ComponentParameter(FileCache), new ConstantParameter(root)})
return container
No revision
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- nanocontainer.groovy 20 Apr 2004 22:38:50 -0000 1.1.2.3
+++ nanocontainer.groovy 22 Apr 2004 21:05:42 -0000 1.1.2.4
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import org.picocontainer.defaults.DefaultPicoContainer
+import org.apache.jetspeed.components.ChildAwareContainer
import org.picocontainer.ComponentAdapter
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
@@ -31,17 +31,14 @@
import java.util.Properties
applicationRoot = System.getProperty("org.apache.jetspeed.application_root", "./")
+pageRoot = System.getProperty("org.apache.jetspeed.page_root", "/WEB-INF/pages")
-container = new DefaultPicoContainer()
+container = new ChildAwareContainer(parent)
-root = applicationRoot + "/testdata/pages"
-Long scanRate = 120
-cacheSize = 100
-// fileCache = new FileCache(scanRate, cacheSize)
-pageManager = new CastorXmlPageManager(parent.getComponentInstance("IdGenerator"), parent.getComponentInstance(FileCache), root)
-container.registerComponentInstance(PageManager, pageManager)
-// container.registerComponentImplementation(PageManager, CastorXmlPageManager, new Parameter[] {new ComponentParameter("IdGenerator"), new ComponentParameter(FileCache), new ConstantParameter(root)})
+root = applicationRoot + pageRoot
+
+container.registerComponentImplementation(PageManager, CastorXmlPageManager, new Parameter[] {new ComponentParameter("IdGenerator"), new ComponentParameter(FileCache), new ConstantParameter(root)})
return container
1.1.2.1 +127 -0 jakarta-jetspeed-2/components/page-manager/src/java/META-INF/Attic/page-mapping.xml
No revision
No revision
1.1.2.2 +1 -1 jakarta-jetspeed-2/components/page-manager/Attic/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/Attic/project.properties,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.properties 20 Apr 2004 03:08:47 -0000 1.1.2.1
+++ project.properties 22 Apr 2004 21:05:42 -0000 1.1.2.2
@@ -41,7 +41,7 @@
database.default.name=hsql
-# Sets up the system properties for the test JDBC datasource
+# Sets up the system properties for unit testing
maven.junit.sysproperties=org.apache.jetspeed.database.url \
org.apache.jetspeed.database.driver \
org.apache.jetspeed.database.user \
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- project.xml 20 Apr 2004 19:52:40 -0000 1.1.2.2
+++ project.xml 22 Apr 2004 21:05:42 -0000 1.1.2.3
@@ -72,7 +72,7 @@
</properties>
</dependency>
<dependency>
- <id>jetspeed2:jetspeed-profiler</id>
+ <id>jetspeed2:jetspeed-file-cache</id>
<version>2.0-a1-dev</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
1.1.2.3 +4 -3 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- maven.xml 20 Apr 2004 19:52:40 -0000 1.1.2.2
+++ maven.xml 22 Apr 2004 21:05:42 -0000 1.1.2.3
@@ -54,9 +54,10 @@
</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" />
- <copy todir="${basedir}/target/deploy" file="${maven.repo.local}/jetspeed2/jars/jetspeed-id-generator-2.0-a1-dev.jar" />
+ <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>
No revision
No revision
1.1.2.1 +42 -0 jakarta-jetspeed-2/components/page-manager/WEB-INF/pages/Attic/default-page.psml
1.1.2.1 +43 -0 jakarta-jetspeed-2/components/page-manager/WEB-INF/pages/Attic/test001.psml
No revision
No revision
1.1.2.3 +26 -10 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CastorXmlPageManager.java 20 Apr 2004 19:48:12 -0000 1.1.2.2
+++ CastorXmlPageManager.java 22 Apr 2004 21:05:42 -0000 1.1.2.3
@@ -18,11 +18,13 @@
//standard java stuff
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileReader;
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;
@@ -83,30 +85,38 @@
protected OutputFormat format = null;
// castor mapping
- protected String mapFileResource = "org/apache/jetspeed/page/impl/page-mapping.xml";
+ protected String mapFileResource = "META-INF/page-mapping.xml";
/** the Castor mapping file name */
protected Mapping mapping = null;
- public CastorXmlPageManager(IdGenerator generator, FileCache fileCache, String root)
+ public CastorXmlPageManager(IdGenerator generator, FileCache fileCache, String root) throws FileNotFoundException
{
super(generator);
this.rootDir = new File(root);
- this.pages = fileCache;
+ this.pages = fileCache;
+ if(!this.rootDir.exists())
+ {
+ throw new FileNotFoundException("PSML page directory, "+rootDir.getAbsolutePath()+", does not exist.");
+ }
}
- public CastorXmlPageManager(IdGenerator generator, FileCache fileCache, String root, List modelClasses)
+ public CastorXmlPageManager(IdGenerator generator, FileCache fileCache, String root, List modelClasses) throws FileNotFoundException
{
super(generator, modelClasses);
this.rootDir = new File(root);
- this.pages = fileCache;
+ this.pages = fileCache;
+ if(!this.rootDir.exists())
+ {
+ throw new FileNotFoundException("PSML page directory, "+rootDir.getAbsolutePath()+", does not exist.");
+ }
}
public CastorXmlPageManager(IdGenerator generator,
FileCache fileCache,
String root,
List modelClasses,
- String extension)
+ String extension) throws FileNotFoundException
{
this(generator, fileCache, root, modelClasses);
@@ -397,7 +407,13 @@
{
try
{
- InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(mapFileResource);
+ // InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(mapFileResource);
+ // URL mapUrl = Thread.currentThread().getContextClassLoader().getResource(mapFileResource);
+ URL mapUrl = getClass().getClassLoader().getResource(mapFileResource);
+ if(mapUrl == null)
+ {
+ throw new IOException("Unbale to load Castor mapping "+mapFileResource+" system resource.");
+ }
if (log.isDebugEnabled())
{
@@ -407,8 +423,8 @@
mapping = new Mapping();
- InputSource is = new InputSource(stream);
- is.setSystemId(mapFileResource);
+ InputSource is = new InputSource(mapUrl.openStream());
+ // is.setSystemId(mapFileResource);
mapping.loadMapping(is);
}
No revision
No revision
1.1.2.1 +43 -0 jakarta-jetspeed-2/components/page-manager/src/test/Attic/Log4j.properties
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org