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 at...@apache.org on 2007/08/22 04:33:01 UTC
svn commit: r568384 [1/2] - in /portals/jetspeed-2/trunk/components:
jetspeed-capability/
jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/
jetspeed-cm/ jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/
jetspeed-file-cach...
Author: ate
Date: Tue Aug 21 19:32:58 2007
New Revision: 568384
URL: http://svn.apache.org/viewvc?rev=568384&view=rev
Log:
JS2-770: Provide a new maven-2 (only) build environment and restructure the source tree according to the maven-2 conventions
See: http://issues.apache.org/jira/browse/JS2-770
Completion of new test environment with all components test cases working again.
You need to update you the local m2 settings.xml with the following required properties for your selected database (see updated settings.xml.sample):
<org.apache.jetspeed.test.jdbc.driver.groupId>SETGROUPID</org.apache.jetspeed.test.jdbc.driver.groupId>
<org.apache.jetspeed.test.jdbc.driver.artifactId>SETARTIFACTID</org.apache.jetspeed.test.jdbc.driver.artifactId>
<org.apache.jetspeed.test.jdbc.driver.version>SETVERSION</org.apache.jetspeed.test.jdbc.driver.version>
<org.apache.jetspeed.production.jdbc.driver.groupId>SETGROUPID</org.apache.jetspeed.test.jdbc.driver.groupId>
<org.apache.jetspeed.production.jdbc.driver.artifactId>SETARTIFACTID</org.apache.jetspeed.test.jdbc.driver.artifactId>
<org.apache.jetspeed.production.jdbc.driver.version>SETVERSION</org.apache.jetspeed.test.jdbc.driver.version>
Then create your portal test database schema:
$ mvn -P test-setup org.apache.portals.jetspeed-2:jetspeed-maven-plugins:init-db
And finally, you then can build *and* test the jetspeed-api, commons and all components with:
$ mvn -P test install
Added:
portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/
portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/
portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/
portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-registry/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-registry/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
- copied unchanged from r567719, portals/jetspeed-2/trunk/components/jetspeed-registry/src/test/resources/assembly/registry-test.xml
portals/jetspeed-2/trunk/components/jetspeed-security/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-security/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-sso/src/test/resources/
portals/jetspeed-2/trunk/components/jetspeed-sso/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-sso/src/test/resources/boot/datasource.xml (with props)
portals/jetspeed-2/trunk/components/jetspeed-statistics/src/test/resources/
portals/jetspeed-2/trunk/components/jetspeed-statistics/src/test/resources/boot/
portals/jetspeed-2/trunk/components/jetspeed-statistics/src/test/resources/boot/datasource.xml (with props)
Removed:
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/resources/
portals/jetspeed-2/trunk/components/jetspeed-registry/src/test/resources/assembly/registry-test.xml
portals/jetspeed-2/trunk/components/jetspeed-rewriter/src/test/resources/
Modified:
portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java
portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
portals/jetspeed-2/trunk/components/jetspeed-file-cache/src/test/java/org/apache/jetspeed/cache/file/TestFileCache.java
portals/jetspeed-2/trunk/components/jetspeed-locator/src/test/java/org/apache/jetspeed/locator/TestTemplateLocator.java
portals/jetspeed-2/trunk/components/jetspeed-page-manager/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/PageManagerTestShared.java
portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java
portals/jetspeed-2/trunk/components/jetspeed-portal-site/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortalTestConstants.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestConstraintsAction.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestLayout.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security
portals/jetspeed-2/trunk/components/jetspeed-prefs/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-profiler/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java
portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
portals/jetspeed-2/trunk/components/jetspeed-rdbms/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java
portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceTestCase.java
portals/jetspeed-2/trunk/components/jetspeed-registry/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-rewriter/src/test/java/org/apache/jetspeed/rewriter/TestNekoRewriter.java
portals/jetspeed-2/trunk/components/jetspeed-rewriter/src/test/java/org/apache/jetspeed/rewriter/TestRewriterController.java
portals/jetspeed-2/trunk/components/jetspeed-security/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/audit/TestAuditActivity.java
portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml
Modified: portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml Tue Aug 21 19:32:58 2007
@@ -69,14 +69,6 @@
</dependency>
</dependencies>
- <properties>
- <!-- Enable unit test again
- Weirdly enough, defining -Dmaven.test.skip=true on the commandline doesn't work
- with maven.test.skip=true defined in the root pom ???
- -->
- <maven.test.skip>false</maven.test.skip>
- </properties>
-
<build>
<plugins>
<plugin>
Modified: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java Tue Aug 21 19:32:58 2007
@@ -73,7 +73,7 @@
System.out.println("testSetup");
JetspeedSerializer serializer = (JetspeedSerializer)ctx.getBean("serializer");
serializer.deleteData();
- serializer.importData(getBasedir()+"target/test-classes/j2-seed.xml");
+ serializer.importData("target/test-classes/j2-seed.xml");
}
/**
Modified: portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml Tue Aug 21 19:32:58 2007
@@ -98,7 +98,13 @@
<artifactId>oro</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Runtime Dependencies -->
<dependency>
<groupId>cglib</groupId>
@@ -153,7 +159,10 @@
<configuration>
<excludes>
<exclude>**/TestInterceptorAdapter.java</exclude>
+ <!-- workaround for still not fixed SUREFIRE-288: Surefire tries to instantiate nested TestCase classes -->
+ <exclude>**/*$*</exclude>
</excludes>
+
</configuration>
</plugin>
</plugins>
Modified: portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java Tue Aug 21 19:32:58 2007
@@ -87,18 +87,4 @@
{
return null;
}
-
- /**
- * return current project base directory delimited by path separator or empty String if
- * basedir environment isn't defined (by maven-surefire plugin)
- */
- protected String getBasedir()
- {
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- return basedir + File.separator;
- }
- return "";
- }
}
Modified: portals/jetspeed-2/trunk/components/jetspeed-file-cache/src/test/java/org/apache/jetspeed/cache/file/TestFileCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-file-cache/src/test/java/org/apache/jetspeed/cache/file/TestFileCache.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-file-cache/src/test/java/org/apache/jetspeed/cache/file/TestFileCache.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-file-cache/src/test/java/org/apache/jetspeed/cache/file/TestFileCache.java Tue Aug 21 19:32:58 2007
@@ -40,7 +40,7 @@
public class TestFileCache extends TestCase implements FileCacheEventListener
{
- protected static final String TEST_DIRECTORY = "./testdata";
+ protected static final String TEST_DIRECTORY = "target/test-classes";
protected static final int CACHE_SIZE = 20;
protected static final int SCAN_RATE = 10;
String refreshedEntry = null;
@@ -228,7 +228,6 @@
System.out.println(entry.getFile().getName());
}
}
-
}
Modified: portals/jetspeed-2/trunk/components/jetspeed-locator/src/test/java/org/apache/jetspeed/locator/TestTemplateLocator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-locator/src/test/java/org/apache/jetspeed/locator/TestTemplateLocator.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-locator/src/test/java/org/apache/jetspeed/locator/TestTemplateLocator.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-locator/src/test/java/org/apache/jetspeed/locator/TestTemplateLocator.java Tue Aug 21 19:32:58 2007
@@ -16,6 +16,7 @@
*/
package org.apache.jetspeed.locator;
+import java.io.File;
import java.util.ArrayList;
import junit.framework.Test;
@@ -125,7 +126,7 @@
protected void setUp() throws Exception
{
ArrayList roots = new ArrayList(1);
- roots.add("./testdata/templates");
+ roots.add("target/test-classes/templates");
ArrayList classes = new ArrayList(2);
classes.add(JetspeedTemplateDescriptor.class);
classes.add(JetspeedLocatorDescriptor.class);
Modified: portals/jetspeed-2/trunk/components/jetspeed-page-manager/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-page-manager/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-page-manager/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-page-manager/pom.xml Tue Aug 21 19:32:58 2007
@@ -87,6 +87,98 @@
<artifactId>jetspeed-id-generator</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ Note: tyrex and junit is normally required only for test, but
+ in this case, abstract test cases are included in the
+ component build... this should probably be fixed...
+ for now, assume that junit will be provided if these
+ test classes are used.
+ -->
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- multiple database PageManager related tests require forking for each and every testcase -->
+ <forkMode>always</forkMode>
+ <excludes>
+ <exclude>**/*$*</exclude>
+ <exclude>**/PageManagerTestShared.java</exclude>
+ <exclude>**/DirectoryXMLTransform.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-maven-plugins</artifactId>
+ <version>${pom.version}</version>
+ <dependencies>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack-resources</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
+ <targetBaseDirectory>${project.build.directory}</targetBaseDirectory>
+ <resources>
+ <unpack dest="webapp/WEB-INF/pages">
+ <entryset dir="webapp/WEB-INF/pages"/>
+ </unpack>
+ <unpack dest="test-classes">
+ <entryset dir="webapp/WEB-INF/assembly" includes="transaction.xml"/>
+ <entryset dir="db-ojb"/>
+ </unpack>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ </build>
</project>
Modified: portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/PageManagerTestShared.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/PageManagerTestShared.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/PageManagerTestShared.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/PageManagerTestShared.java Tue Aug 21 19:32:58 2007
@@ -97,7 +97,7 @@
throws Exception
{
Map extensionsToXslt = new HashMap();
- extensionsToXslt.put("psml","resources/stripIds.xslt");
+ extensionsToXslt.put("psml","src/main/resources/stripIds.xslt");
File pagesDirFile = new File("target/testdata/" + pagesDirName);
@@ -110,12 +110,12 @@
return !pathname.getName().equals("CVS") && !pathname.getName().equals(".svn") && !pathname.getName().endsWith("~");
}
};
- dirHelper.copyFrom(new File("testdata/" + pagesDirName), noCVSorSVNorBackups);
+ dirHelper.copyFrom(new File("src/test/testdata/" + pagesDirName), noCVSorSVNorBackups);
// copy documents under webapp/pages folder and strip fragment Ids
File webappDestDirFile = new File("target/testdata/" + pagesDirName+"/webapp-no-ids");
dirHelper.setBaseDirectory(webappDestDirFile);
- File webappPagesDirFile = new File("../../src/webapp/WEB-INF/pages");
+ File webappPagesDirFile = new File("target/webapp/WEB-INF/pages");
dirHelper.copyFromAndTransform(webappPagesDirFile, noCVSorSVNorBackups);
// copy documents under webapp/pages folder without transforming them
Modified: portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java Tue Aug 21 19:32:58 2007
@@ -63,7 +63,7 @@
"/JETSPEED-INF/castor/page-mapping.xml",
"folder.metadata",
FolderMetaDataImpl.class,
- "testdata/pages",
+ "src/test/testdata/pages",
new FileCache());
Map handlerMap = new HashMap();
Added: portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml?rev=568384&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml Tue Aug 21 19:32:58 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName"><value>${org.apache.jetspeed.test.database.driver}</value></property>
+ <property name="url"><value>${org.apache.jetspeed.test.database.url}</value></property>
+ <property name="username"><value>${org.apache.jetspeed.test.database.user}</value></property>
+ <property name="password"><value>${org.apache.jetspeed.test.database.password}</value></property>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal-site/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal-site/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal-site/pom.xml Tue Aug 21 19:32:58 2007
@@ -83,4 +83,30 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>portal-site-testdata</id>
+ <phase>generate-test-resources</phase>
+ <configuration>
+ <tasks>
+ <delete dir="${basedir}/target/testdata"/>
+ <mkdir dir="${basedir}/target/testdata"/>
+ <copy todir="${basedir}/target/testdata">
+ <fileset dir="${basedir}/src/test/testdata"/>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml Tue Aug 21 19:32:58 2007
@@ -183,6 +183,22 @@
<artifactId>mockrunner</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
@@ -205,4 +221,63 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- some tests require forking -->
+ <forkMode>always</forkMode>
+ <excludes>
+ <exclude>**/*$*</exclude>
+ <exclude>**/TestAggregator.java</exclude>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-maven-plugins</artifactId>
+ <version>${pom.version}</version>
+ <dependencies>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack-resources</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
+ <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>
+ <resources>
+ <unpack>
+ <entryset dir="webapp/WEB-INF/assembly"/>
+ <entryset dir="db-ojb"/>
+ </unpack>
+ <unpack dest="webapp">
+ <entryset dir="webapp"/>
+ </unpack>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ </build>
</project>
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml Tue Aug 21 19:32:58 2007
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You 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
-
-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.
--->
-<beans>
-
- <!-- PageManager -->
- <bean id="PsmlDocumentHandler"
- class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>.psml</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="LinkDocumentHandler"
- class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>.link</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="FolderMetaDataDocumentHandler"
- class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="PageSecurityDocumentHandler"
- class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>page.security</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>
- <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="DocumentHandlerFactory"
- class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >
- <constructor-arg>
- <map>
- <entry key=".psml">
- <ref bean="PsmlDocumentHandler" />
- </entry>
- <entry key=".link">
- <ref bean="LinkDocumentHandler" />
- </entry>
- <entry key="folder.metadata">
- <ref bean="FolderMetaDataDocumentHandler" />
- </entry>
- <entry key="page.security">
- <ref bean="PageSecurityDocumentHandler" />
- </entry>
- </map>
- </constructor-arg>
- </bean>
-
- <bean id="FolderHandler"
- class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >
- <constructor-arg index="0"><value>target/test-classes/pages</value></constructor-arg>
- <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
- <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.page.PageManager"
- name="pageManager"
- class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
- <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
- <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
- <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
- <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>
- <!-- permissions security enabled flag, default=false -->
- <constructor-arg index="4"><value>false</value></constructor-arg>
- <!-- constraints security enabled flag, default=true -->
- <constructor-arg index="5"><value>true</value></constructor-arg>
- </bean>
-
- <!-- PortalSite -->
- <bean id="org.apache.jetspeed.portalsite.PortalSite"
- name="portalSite"
- class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
- <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
- </bean>
-
- <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
- <!-- ID Start value -->
- <constructor-arg index="0">
- <value>65536</value>
- </constructor-arg>
- <!-- ID Prefix -->
- <constructor-arg index="1">
- <value>P-</value>
- </constructor-arg>
- <!-- ID Suffix -->
- <constructor-arg index="2">
- <value></value>
- </constructor-arg>
- </bean>
-
- <!-- Page File Cache -->
- <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
- <!-- Scan rate for changes in cached files on the file system -->
- <constructor-arg index="0">
- <value>10</value>
- </constructor-arg>
- <!-- Cache size -->
- <constructor-arg index="1">
- <value>100</value>
- </constructor-arg>
- </bean>
-
-</beans>
+the License. You may obtain a copy of the License at
+
+ 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.
+-->
+<beans>
+
+ <!-- PageManager -->
+ <bean id="PsmlDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>.psml</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>src/test/testdata/pages/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="LinkDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>.link</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>src/test/testdata/pages/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="FolderMetaDataDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>src/test/testdata/pages/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="PageSecurityDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>page.security</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>src/test/testdata/pages/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="DocumentHandlerFactory"
+ class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >
+ <constructor-arg>
+ <map>
+ <entry key=".psml">
+ <ref bean="PsmlDocumentHandler" />
+ </entry>
+ <entry key=".link">
+ <ref bean="LinkDocumentHandler" />
+ </entry>
+ <entry key="folder.metadata">
+ <ref bean="FolderMetaDataDocumentHandler" />
+ </entry>
+ <entry key="page.security">
+ <ref bean="PageSecurityDocumentHandler" />
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="FolderHandler"
+ class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >
+ <constructor-arg index="0"><value>src/test/testdata/pages/pages</value></constructor-arg>
+ <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+ <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.page.PageManager"
+ name="pageManager"
+ class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
+ <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+ <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+ <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
+ <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>
+ <!-- permissions security enabled flag, default=false -->
+ <constructor-arg index="4"><value>false</value></constructor-arg>
+ <!-- constraints security enabled flag, default=true -->
+ <constructor-arg index="5"><value>true</value></constructor-arg>
+ </bean>
+
+ <!-- PortalSite -->
+ <bean id="org.apache.jetspeed.portalsite.PortalSite"
+ name="portalSite"
+ class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
+ <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
+ </bean>
+
+ <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
+ <!-- ID Start value -->
+ <constructor-arg index="0">
+ <value>65536</value>
+ </constructor-arg>
+ <!-- ID Prefix -->
+ <constructor-arg index="1">
+ <value>P-</value>
+ </constructor-arg>
+ <!-- ID Suffix -->
+ <constructor-arg index="2">
+ <value></value>
+ </constructor-arg>
+ </bean>
+
+ <!-- Page File Cache -->
+ <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
+ <!-- Scan rate for changes in cached files on the file system -->
+ <constructor-arg index="0">
+ <value>10</value>
+ </constructor-arg>
+ <!-- Cache size -->
+ <constructor-arg index="1">
+ <value>100</value>
+ </constructor-arg>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortalTestConstants.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortalTestConstants.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortalTestConstants.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortalTestConstants.java Tue Aug 21 19:32:58 2007
@@ -25,9 +25,9 @@
*/
public class PortalTestConstants
{
- public final static String JETSPEED_PROPERTIES_PATH = "../../src/webapp/WEB-INF/conf/jetspeed.properties";
+ public final static String JETSPEED_PROPERTIES_PATH = "target/test-classes/webapp/WEB-INF/conf/jetspeed.properties";
- public final static String PORTAL_WEBAPP_PATH = "../../src/webapp";
+ public final static String PORTAL_WEBAPP_PATH = "target/test-classes/webapp";
- public static final String JETSPEED_APPLICATION_ROOT = "../../src/webapp";
+ public static final String JETSPEED_APPLICATION_ROOT = "target/test-classes/webapp";
}
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java Tue Aug 21 19:32:58 2007
@@ -108,7 +108,7 @@
public void testFileSystemManagerOnDir() throws Exception
{
- File demoApp = new File("./test/testdata/deploy/webapp");
+ File demoApp = new File("src/test/testdata/deploy/webapp");
assertTrue(demoApp.exists());
DirectoryHelper dirHelper = new DirectoryHelper(demoApp);
@@ -361,7 +361,7 @@
try
{
super.setUp();
- copyFrom = new File("./test/deployment/deploy");
+ copyFrom = new File("src/test/deployment/deploy");
deploySrc = new File("./target/deployment/deploy");
deploySrc.mkdirs();
deployRootFile = new File("./target/deployment/templates/decorators");
@@ -370,7 +370,7 @@
webAppsDirFile.mkdirs();
webAppsDir = webAppsDirFile.getCanonicalPath();
- testDb = new File("./test/db/hsql/Registry").getCanonicalPath();
+// testDb = new File("src/test/db/hsql/Registry").getCanonicalPath();
copyDeployables();
// windowAccess = new PortletWindowAccessorImpl(entityAccess, true);
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestConstraintsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestConstraintsAction.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestConstraintsAction.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestConstraintsAction.java Tue Aug 21 19:32:58 2007
@@ -85,8 +85,8 @@
String[] bootConfigs = null;
String[] appConfigs =
{ //"src/webapp/WEB-INF/assembly/layout-api.xml",
- "src/test/resources/assembly/test-layout-constraints-api.xml",
- "src/test/resources/assembly/page-manager.xml"};
+ "src/test/assembly/test-layout-constraints-api.xml",
+ "src/test/assembly/page-manager.xml"};
cm = new SpringComponentManager(bootConfigs, appConfigs, servletContent, ".");
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestLayout.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestLayout.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestLayout.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/TestLayout.java Tue Aug 21 19:32:58 2007
@@ -65,7 +65,7 @@
String[] bootConfigs = null;
String[] appConfigs =
{ //"src/webapp/WEB-INF/assembly/layout-api.xml",
- "src/test/resources/assembly/test-layout-api.xml"};
+ "src/test/assembly/test-layout-api.xml"};
cm = new SpringComponentManager(bootConfigs, appConfigs, servletContent, ".");
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java Tue Aug 21 19:32:58 2007
@@ -73,7 +73,7 @@
public void testLoadPortletApplicationTree() throws Exception
{
System.out.println("Testing loadPortletApplicationTree");
- PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("./test/testdata/deploy/portlet.xml"), "unit-test");
+ PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("src/test/testdata/deploy/portlet.xml"), "unit-test");
MutablePortletApplication app = pad.createPortletApplication();
assertNotNull("App is null", app);
assertNotNull("Version is null", app.getVersion());
@@ -83,7 +83,7 @@
"PA Identifier invalid: " + app.getApplicationIdentifier(),
app.getApplicationIdentifier().equals("TestRegistry"));
- ExtendedPortletMetadata md = new ExtendedPortletMetadata(new FileReader("./test/testdata/deploy/jetspeed-portlet.xml"), app);
+ ExtendedPortletMetadata md = new ExtendedPortletMetadata(new FileReader("src/test/testdata/deploy/jetspeed-portlet.xml"), app);
md.load();
PortletDefinitionComposite def1 = (PortletDefinitionComposite)app.getPortletDefinitionByName(PORTLET_01);
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java Tue Aug 21 19:32:58 2007
@@ -94,7 +94,7 @@
public void testLoadPortletApplicationTree() throws Exception
{
System.out.println("Testing loadPortletApplicationTree");
- PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("./test/testdata/deploy/portlet.xml"), "unit-test");
+ PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("src/test/testdata/deploy/portlet.xml"), "unit-test");
MutablePortletApplication app = pad.createPortletApplication();
assertNotNull("App is null", app);
assertNotNull("Version is null", app.getVersion());
@@ -303,7 +303,7 @@
}
- PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("./test/testdata/deploy/portlet2.xml"), "HW_App");
+ PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("src/test/testdata/deploy/portlet2.xml"), "HW_App");
app = pad.createPortletApplication();
app.setName("HW_App");
@@ -347,7 +347,7 @@
public void testInfusingWebXML() throws Exception
{
- File warFile = new File("./test/testdata/deploy/webapp");
+ File warFile = new File("src/test/testdata/deploy/webapp");
PortletApplicationWar paWar = new PortletApplicationWar(new DirectoryHelper(warFile), "unit-test", "/" );
SAXBuilder builder = new SAXBuilder(false);
@@ -369,7 +369,7 @@
}
});
- FileReader srcReader = new FileReader("./test/testdata/deploy/webapp/WEB-INF/web.xml");
+ FileReader srcReader = new FileReader("src/test/testdata/deploy/webapp/WEB-INF/web.xml");
FileReader targetReader = null;
Document doc = builder.build(srcReader);
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java Tue Aug 21 19:32:58 2007
@@ -78,7 +78,7 @@
public void testSecurityRoles() throws Exception
{
System.out.println("Testing securityRoles");
- File warFile = new File("./test/testdata/deploy/webapp");
+ File warFile = new File("src/test/testdata/deploy/webapp");
PortletApplicationWar paWar = new PortletApplicationWar(new DirectoryHelper(warFile), "unit-test", "/" );
MutablePortletApplication app = paWar.createPortletApp();
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java Tue Aug 21 19:32:58 2007
@@ -96,7 +96,7 @@
private void innerTestSetUserInfoMap(UserInfoManager uim) throws Exception
{
- PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("test/testdata/deploy/portlet.xml"), "unit-test");
+ PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("src/test/testdata/deploy/portlet.xml"), "unit-test");
portletApp = pad.createPortletApplication();
assertNotNull("App is null", portletApp);
@@ -130,7 +130,7 @@
assertNull("should not contain user.home-info.online.email", userInfo.get("user.home-info.online.email"));
// With linked attributes
- ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader("test/testdata/deploy/jetspeed-portlet.xml"), portletApp);
+ ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader("src/test/testdata/deploy/jetspeed-portlet.xml"), portletApp);
extMetaData.load();
// persist the app
Added: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml?rev=568384&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml Tue Aug 21 19:32:58 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName"><value>${org.apache.jetspeed.test.database.driver}</value></property>
+ <property name="url"><value>${org.apache.jetspeed.test.database.url}</value></property>
+ <property name="username"><value>${org.apache.jetspeed.test.database.user}</value></property>
+ <property name="password"><value>${org.apache.jetspeed.test.database.password}</value></property>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security Tue Aug 21 19:32:58 2007
@@ -1,88 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You 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
-
-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.
--->
-<page-security xmlns="http://portals.apache.org/jetspeed"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/page-security.xsd">
-
- <!-- define global admin constraints -->
- <security-constraints-def name="admin">
- <security-constraint>
- <roles>admin</roles>
- <permissions>view, edit</permissions>
- </security-constraint>
- </security-constraints-def>
- <global-security-constraints-ref>admin</global-security-constraints-ref>
-
- <!-- define manager constraints -->
- <security-constraints-def name="manager">
- <security-constraint>
- <roles>manager</roles>
- <permissions>view</permissions>
- </security-constraint>
- </security-constraints-def>
-
- <!-- define user constraints -->
- <security-constraints-def name="users">
- <security-constraint>
- <roles>user, manager</roles>
- <permissions>view</permissions>
- </security-constraint>
- </security-constraints-def>
-
- <!-- define public constraints -->
- <security-constraints-def name="public-view">
- <security-constraint>
- <users>*</users>
- <permissions>view</permissions>
- </security-constraint>
- </security-constraints-def>
- <security-constraints-def name="public-edit">
- <security-constraint>
- <users>*</users>
- <permissions>view, edit</permissions>
- </security-constraint>
- </security-constraints-def>
-
- <security-constraints-def name="delete3">
- <security-constraint>
- <users>replaceme</users>
- <permissions>view, edit, help</permissions>
- </security-constraint>
- <!-- delete below -->
- <security-constraint>
- <roles>manager</roles>
- <permissions>view</permissions>
- </security-constraint>
- <security-constraint>
- <roles>admin</roles>
- <permissions>view, edit</permissions>
- </security-constraint>
- <security-constraint>
- <roles>guest</roles>
- <permissions>view</permissions>
- </security-constraint>
- </security-constraints-def>
-
- <security-constraints-def name="deleteme">
- <security-constraint>
- <roles>*</roles>
- <permissions>view, edit</permissions>
- </security-constraint>
- </security-constraints-def>
-
-</page-security>
+<?xml version="1.0" encoding="UTF-8"?>
+<page-security>
+ <security-constraints-def name="admin">
+ <security-constraint>
+ <roles>admin</roles>
+ <permissions>view, edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+ <security-constraints-def name="manager">
+ <security-constraint>
+ <roles>manager</roles>
+ <permissions>view</permissions>
+ </security-constraint>
+ </security-constraints-def>
+ <security-constraints-def name="users">
+ <security-constraint>
+ <roles>user,manager,anon</roles>
+ <permissions>view,edit,help</permissions>
+ </security-constraint>
+ <security-constraint>
+ <groups>accounting,finance</groups>
+ <permissions>view,edit,help</permissions>
+ </security-constraint>
+ <security-constraint>
+ <users>tomcat</users>
+ <permissions>view</permissions>
+ </security-constraint>
+ <security-constraint>
+ <users>manager,admin</users>
+ <permissions>view,help</permissions>
+ </security-constraint>
+ </security-constraints-def>
+ <security-constraints-def name="public-view">
+ <security-constraint>
+ <users>*</users>
+ <permissions>view</permissions>
+ </security-constraint>
+ </security-constraints-def>
+ <security-constraints-def name="public-edit">
+ <security-constraint>
+ <users>*</users>
+ <permissions>view, edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+ <security-constraints-def name="delete3">
+ <security-constraint>
+ <users>*</users>
+ <permissions>view</permissions>
+ </security-constraint>
+ </security-constraints-def>
+ <security-constraints-def name="newone">
+ <security-constraint>
+ <roles>user,manager</roles>
+ <permissions>view,edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+ <global-security-constraints-ref>admin</global-security-constraints-ref>
+ <global-security-constraints-ref>manager</global-security-constraints-ref>
+</page-security>
Modified: portals/jetspeed-2/trunk/components/jetspeed-prefs/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-prefs/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-prefs/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-prefs/pom.xml Tue Aug 21 19:32:58 2007
@@ -49,18 +49,74 @@
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-rdbms</artifactId>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
<!--
- Note: junit is normally required only for test, but
+ Note: tyrex and junit is normally required only for test, but
in this case, abstract test cases are included in the
component build... this should probably be fixed...
for now, assume that junit will be provided if these
test classes are used.
-->
<dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-maven-plugins</artifactId>
+ <version>${pom.version}</version>
+ <dependencies>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack-resources</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
+ <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>
+ <resources>
+ <unpack>
+ <entryset dir="webapp/WEB-INF/assembly" includes="prefs.xml,transaction.xml,cache.xml"/>
+ <entryset dir="db-ojb"/>
+ </unpack>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
+
</project>
Added: portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml?rev=568384&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml Tue Aug 21 19:32:58 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName"><value>${org.apache.jetspeed.test.database.driver}</value></property>
+ <property name="url"><value>${org.apache.jetspeed.test.database.url}</value></property>
+ <property name="username"><value>${org.apache.jetspeed.test.database.user}</value></property>
+ <property name="password"><value>${org.apache.jetspeed.test.database.password}</value></property>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/trunk/components/jetspeed-profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-profiler/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-profiler/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-profiler/pom.xml Tue Aug 21 19:32:58 2007
@@ -61,6 +61,74 @@
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-serializer</artifactId>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ Note: tyrex and junit is normally required only for test, but
+ in this case, abstract test cases are included in the
+ component build... this should probably be fixed...
+ for now, assume that junit will be provided if these
+ test classes are used.
+ -->
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-maven-plugins</artifactId>
+ <version>${pom.version}</version>
+ <dependencies>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack-resources</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
+ <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>
+ <resources>
+ <unpack>
+ <entryset dir="webapp/WEB-INF/assembly" includes="profiler.xml,transaction.xml,security-*.xml"/>
+ <entryset dir="db-ojb"/>
+ <entryset dir="seed/min" includes="j2-seed.xml"/>
+ </unpack>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
</project>
Modified: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java Tue Aug 21 19:32:58 2007
@@ -32,8 +32,10 @@
import org.apache.jetspeed.profiler.rules.ProfilingRule;
import org.apache.jetspeed.profiler.rules.RuleCriterion;
import org.apache.jetspeed.security.BasePrincipal;
+import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
+import org.apache.jetspeed.security.UserPrincipal;
import org.apache.jetspeed.serializer.objects.JSPrincipalRule;
import org.apache.jetspeed.serializer.objects.JSPrincipalRules;
import org.apache.jetspeed.serializer.objects.JSProfilingRule;
@@ -85,11 +87,12 @@
try
{
+ String anonymousUser = userManager.getAnonymousUser();
Iterator _itUsers = userManager.getUsers("");
while (_itUsers.hasNext())
{
- JSUser _user = (JSUser) _itUsers.next();
- Principal principal = _user.getPrincipal();
+ User _user = (User) _itUsers.next();
+ Principal principal = SecurityHelper.getPrincipal(_user.getSubject(), UserPrincipal.class);
if (principal != null)
{
Collection col = pm.getRulesForPrincipal(principal);
Modified: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java Tue Aug 21 19:32:58 2007
@@ -42,6 +42,7 @@
import org.apache.jetspeed.security.impl.PrincipalsSet;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
+import org.apache.jetspeed.serializer.JetspeedSerializer;
/**
* TestProfiler
@@ -132,6 +133,18 @@
};
+ /**
+ * First test defined is used to setup the data(base)
+ * <b>DO NOT ADD TESTS ABOVE THIS ONE</b>
+ *
+ */
+ public void testSetup() throws Exception
+ {
+ System.out.println("testSetup");
+ JetspeedSerializer serializer = (JetspeedSerializer)ctx.getBean("serializer");
+ serializer.deleteData();
+ serializer.importData("target/test-classes/j2-seed.xml");
+ }
public void testUserRoleFallback()
throws Exception
@@ -519,7 +532,8 @@
protected String[] getConfigurations()
{
- return new String[]{"profiler.xml", "transaction.xml"};
+ return new String[] { "profiler.xml", "transaction.xml", "serializer.xml", "security-providers.xml",
+ "security-managers.xml", "security-spi.xml", "security-spi-atn.xml", "security-spi-atz.xml", "security-atz.xml" };
}
@@ -708,4 +722,15 @@
assertTrue("didnt find expected number of fallback rules, expected = " + EXPECTED_FALLBACK, fallbackCount == 1);
}
+
+ /**
+ * Last test defined is used to cleanup the data(base)
+ * <b>DO NOT ADD TESTS BELOW THIS ONE</b>
+ */
+ public void testTeardown() throws Exception
+ {
+ System.out.println("testTeardown");
+ JetspeedSerializer serializer = (JetspeedSerializer)ctx.getBean("serializer");
+ serializer.deleteData();
+ }
}
Added: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml?rev=568384&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml Tue Aug 21 19:32:58 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName"><value>${org.apache.jetspeed.test.database.driver}</value></property>
+ <property name="url"><value>${org.apache.jetspeed.test.database.url}</value></property>
+ <property name="username"><value>${org.apache.jetspeed.test.database.user}</value></property>
+ <property name="password"><value>${org.apache.jetspeed.test.database.password}</value></property>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml?rev=568384&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml Tue Aug 21 19:32:58 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+ <bean id="serializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
+ <constructor-arg index="0">
+ <list>
+ <bean class="org.apache.jetspeed.serializer.JetspeedSecuritySerializer">
+ <constructor-arg index="0" ref="org.apache.jetspeed.security.GroupManager"/>
+ <constructor-arg index="1" ref="org.apache.jetspeed.security.RoleManager"/>
+ <constructor-arg index="2" ref="org.apache.jetspeed.security.UserManager"/>
+ <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.PasswordCredentialProvider"/>
+ <constructor-arg index="4" ref="org.apache.jetspeed.security.PermissionManager"/>
+ </bean>
+ <bean class="org.apache.jetspeed.serializer.JetspeedProfilerSerializer">
+ <constructor-arg index="0" ref="org.apache.jetspeed.profiler.Profiler"/>
+ <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager"/>
+ </bean>
+ </list>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <map>
+ <entry key="process_users"><value type="java.lang.Boolean">true</value></entry>
+ <entry key="process_profiler"><value type="java.lang.Boolean">true</value></entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/trunk/components/jetspeed-rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-rdbms/pom.xml?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-rdbms/pom.xml Tue Aug 21 19:32:58 2007
@@ -62,6 +62,17 @@
<groupId>ojb</groupId>
<artifactId>db-ojb</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
<!--
Note: tyrex and junit are normally required only for test, but
in this case, abstract test cases are included in the component
Modified: portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java Tue Aug 21 19:32:58 2007
@@ -38,10 +38,10 @@
public void setup() throws Exception
{
jndi = new TyrexJNDIComponent();
- String url = System.getProperty("org.apache.jetspeed.database.url");
- String driver = System.getProperty("org.apache.jetspeed.database.driver");
- String user = System.getProperty("org.apache.jetspeed.database.user");
- String password = System.getProperty("org.apache.jetspeed.database.password");
+ String url = System.getProperty("org.apache.jetspeed.test.database.url");
+ String driver = System.getProperty("org.apache.jetspeed.test.database.driver");
+ String user = System.getProperty("org.apache.jetspeed.test.database.user");
+ String password = System.getProperty("org.apache.jetspeed.test.database.password");
datasourceComponent = new BoundDBCPDatasourceComponent(user, password, driver, url, 20, 5000,
GenericObjectPool.WHEN_EXHAUSTED_GROW, true, JNDI_DS_NAME, jndi);
datasourceComponent.start();
Modified: portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceTestCase.java?rev=568384&r1=568383&r2=568384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceTestCase.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceTestCase.java Tue Aug 21 19:32:58 2007
@@ -59,10 +59,10 @@
{
super.setUp();
jndi = new TyrexJNDIComponent();
- String url = System.getProperty("org.apache.jetspeed.database.url");
- String driver = System.getProperty("org.apache.jetspeed.database.driver");
- String user = System.getProperty("org.apache.jetspeed.database.user");
- String password = System.getProperty("org.apache.jetspeed.database.password");
+ String url = System.getProperty("org.apache.jetspeed.test.database.url");
+ String driver = System.getProperty("org.apache.jetspeed.test.database.driver");
+ String user = System.getProperty("org.apache.jetspeed.test.database.user");
+ String password = System.getProperty("org.apache.jetspeed.test.database.password");
datasourceComponent = new BoundDBCPDatasourceComponent(user, password, driver, url, 20, 5000,
GenericObjectPool.WHEN_EXHAUSTED_GROW, true, "jetspeed", jndi);
datasourceComponent.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org