weaver 2004/04/19 20:08:51
Modified:
components/persistence/src/test/org/apache/jetspeed/components/persistence
Tag: NANOCONTAINER_DEPLOYER
TestPersistenceContainer.java
components/security/src/test/org/apache/jetspeed/security
Tag: NANOCONTAINER_DEPLOYER TestGroupManager.java
TestUserManager.java TestRdbmsPolicy.java
TestSecurityHelper.java TestLoginModule.java
TestRoleManager.java TestPermissionManager.java
components/prefs Tag: NANOCONTAINER_DEPLOYER project.xml
maven.xml
components/security Tag: NANOCONTAINER_DEPLOYER project.xml
components/prefs/src/test/org/apache/jetspeed/prefs Tag:
NANOCONTAINER_DEPLOYER TestPreferences.java
TestPropertyManager.java
Added: components/page-manager/src/java/org/apache/jetspeed/page
Tag: NANOCONTAINER_DEPLOYER PageManager.java
PageNotRemovedException.java
PageNotUpdatedException.java
components/profiler/src/java/org/apache/jetspeed/profiler/impl
Tag: NANOCONTAINER_DEPLOYER
ProfileLocatorPropertyImpl.java
ProfileFallbackIterator.java
ProfileLocatorControl.java
JetspeedProfileLocator.java JetspeedProfiler.java
components/page-manager Tag: NANOCONTAINER_DEPLOYER
project.properties project.xml maven.xml maven.log
.cvsignore
components/page-manager/src/java/org/apache/jetspeed/om/page/psml
Tag: NANOCONTAINER_DEPLOYER
AbstractBaseElement.java PropertyImpl.java
PageMetadataImpl.java FragmentImpl.java
ReferenceImpl.java Defaults.java PageImpl.java
PageLocalizedFieldImpl.java
components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl
Tag: NANOCONTAINER_DEPLOYER
RoleFallbackProfilingRule.java
RuleCriterionImpl.java
LanguageCriterionResolver.java
MediatypeCriterionResolver.java PathResolver.java
RoleCriterionResolver.java HardCodedResolver.java
RequestSessionResolver.java StandardResolver.java
CountryCriterionResolver.java
PrincipalRuleImpl.java UserCriterionResolver.java
StandardProfilingRule.java PathSessionResolver.java
GroupRoleUserCriterionResolver.java
AbstractProfilingRule.java
GroupCriterionResolver.java
components/page-manager/src/java/org/apache/jetspeed/page/impl
Tag: NANOCONTAINER_DEPLOYER
CastorXmlPageManager.java DatabasePageManager.java
AbstractPageManager.java page-mapping.xml
components/profiler/src/java/org/apache/jetspeed/profiler
Tag: NANOCONTAINER_DEPLOYER
ProfileLocatorProperty.java ProfileLocator.java
ProfilerException.java Profiler.java
components/profiler Tag: NANOCONTAINER_DEPLOYER maven.xml
maven.log project.xml project.properties .cvsignore
components/page-manager/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/page-manager/src/java/org/apache/jetspeed/om/page
Tag: NANOCONTAINER_DEPLOYER BaseElement.java
Page.java Property.java Fragment.java
Reference.java package.html
components/profiler/src/test/org/apache/jetspeed/profiler
Tag: NANOCONTAINER_DEPLOYER TestProfiler.java
components/profiler/src/java/org/apache/jetspeed/profiler/rules
Tag: NANOCONTAINER_DEPLOYER PrincipalRule.java
RuleCriterionResolver.java ProfilingRule.java
RuleCriterion.java
components/security/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/page-manager/src/test/org/apache/jetspeed/page
Tag: NANOCONTAINER_DEPLOYER
TestCastorXmlPageManager.java
TestDatabasePageManager.java
components/page-manager/src/java/org/apache/jetspeed/om/folder
Tag: NANOCONTAINER_DEPLOYER Folder.java
components/page-manager/src/java/org/apache/jetspeed/om/desktop
Tag: NANOCONTAINER_DEPLOYER Desktop.java
components/page-manager/src/test/org/apache/jetspeed/om/page
Tag: NANOCONTAINER_DEPLOYER
TestPageObjectModel.java
components/page-manager/testdata/pages Tag:
NANOCONTAINER_DEPLOYER default-page.psml
test001.psml
components/profiler/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/prefs/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/page-manager/src/java/org/apache/jetspeed/om/folder/impl
Tag: NANOCONTAINER_DEPLOYER FolderImpl.java
Removed: portal/src/java/org/apache/jetspeed/om/page/psml Tag:
NANOCONTAINER_DEPLOYER PageLocalizedFieldImpl.java
AbstractBaseElement.java ReferenceImpl.java
PageImpl.java PageMetadataImpl.java Defaults.java
FragmentImpl.java PropertyImpl.java
portal/src/java/org/apache/jetspeed/profiler/rules Tag:
NANOCONTAINER_DEPLOYER RuleCriterion.java
ProfilingRule.java RuleCriterionResolver.java
PrincipalRule.java
portal/src/java/org/apache/jetspeed/profiler/rules/impl Tag:
NANOCONTAINER_DEPLOYER
GroupRoleUserCriterionResolver.java
StandardResolver.java PathResolver.java
RoleCriterionResolver.java
GroupCriterionResolver.java RuleCriterionImpl.java
StandardProfilingRule.java
LanguageCriterionResolver.java
PrincipalRuleImpl.java
MediatypeCriterionResolver.java
AbstractProfilingRule.java
CountryCriterionResolver.java
UserCriterionResolver.java HardCodedResolver.java
PathSessionResolver.java
RoleFallbackProfilingRule.java
RequestSessionResolver.java
portal/src/java/org/apache/jetspeed/page/impl Tag:
NANOCONTAINER_DEPLOYER page-mapping.xml
AbstractPageManager.java CastorXmlPageManager.java
DatabasePageManager.java
portal/src/java/org/apache/jetspeed/page Tag:
NANOCONTAINER_DEPLOYER PageNotRemovedException.java
PageManager.java PageNotUpdatedException.java
portal/src/java/org/apache/jetspeed/profiler/impl Tag:
NANOCONTAINER_DEPLOYER JetspeedProfileLocator.java
ProfileLocatorPropertyImpl.java
JetspeedProfiler.java ProfileLocatorControl.java
ProfileFallbackIterator.java
portal/src/java/org/apache/jetspeed/profiler Tag:
NANOCONTAINER_DEPLOYER ProfileLocatorProperty.java
Profiler.java ProfileLocator.java
ProfilerException.java
portal/src/java/org/apache/jetspeed/om/folder/impl Tag:
NANOCONTAINER_DEPLOYER FolderImpl.java
portal/src/test/org/apache/jetspeed/page Tag:
NANOCONTAINER_DEPLOYER
TestCastorXmlPageManager.java
TestDatabasePageManager.java
portal/src/java/org/apache/jetspeed/om/desktop Tag:
NANOCONTAINER_DEPLOYER Desktop.java
portal/src/test/org/apache/jetspeed/om/page Tag:
NANOCONTAINER_DEPLOYER TestPageObjectModel.java
portal/src/java/org/apache/jetspeed/om/folder Tag:
NANOCONTAINER_DEPLOYER Folder.java
portal/src/java/org/apache/jetspeed/om/page Tag:
NANOCONTAINER_DEPLOYER Reference.java package.html
Page.java Fragment.java Property.java
BaseElement.java
portal/src/test/org/apache/jetspeed/profiler Tag:
NANOCONTAINER_DEPLOYER TestProfiler.java
Log:
- Componentizing profiler and page manager
- Converting prefs and security to use nanodeployer
Revision Changes Path
No revision
No revision
1.1.2.1 +101 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/Attic/PageManager.java
1.1.2.1 +69 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/Attic/PageNotRemovedException.java
1.1.2.1 +69 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/Attic/PageNotUpdatedException.java
No revision
No revision
1.1.2.1 +116 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/Attic/ProfileLocatorPropertyImpl.java
1.1.2.1 +113 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/Attic/ProfileFallbackIterator.java
1.1.2.1 +31 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/Attic/ProfileLocatorControl.java
1.1.2.1 +109 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/Attic/JetspeedProfileLocator.java
1.1.2.1 +373 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/Attic/JetspeedProfiler.java
No revision
No revision
1.1.2.1 +55 -0
jakarta-jetspeed-2/components/page-manager/Attic/project.properties
1.1.2.1 +333 -0 jakarta-jetspeed-2/components/page-manager/Attic/project.xml
1.1.2.1 +61 -0 jakarta-jetspeed-2/components/page-manager/Attic/maven.xml
1.1.2.1 +9 -0 jakarta-jetspeed-2/components/page-manager/Attic/maven.log
1.1.2.1 +1 -0 jakarta-jetspeed-2/components/page-manager/Attic/.cvsignore
No revision
No revision
1.1.2.1 +97 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/AbstractBaseElement.java
1.1.2.1 +117 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/PropertyImpl.java
1.1.2.1 +36 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/PageMetadataImpl.java
1.1.2.1 +204 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/FragmentImpl.java
1.1.2.1 +31 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/ReferenceImpl.java
1.1.2.1 +76 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/Defaults.java
1.1.2.1 +167 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/PageImpl.java
1.1.2.1 +27 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Attic/PageLocalizedFieldImpl.java
No revision
No revision
1.1.2.1 +103 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/RoleFallbackProfilingRule.java
1.1.2.1 +147 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/RuleCriterionImpl.java
1.1.2.1 +47 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/LanguageCriterionResolver.java
1.1.2.1 +47 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/MediatypeCriterionResolver.java
1.1.2.1 +42 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/PathResolver.java
1.1.2.1 +73 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/RoleCriterionResolver.java
1.1.2.1 +37 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/HardCodedResolver.java
1.1.2.1 +47 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/RequestSessionResolver.java
1.1.2.1 +46 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/StandardResolver.java
1.1.2.1 +50 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/CountryCriterionResolver.java
1.1.2.1 +66 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/PrincipalRuleImpl.java
1.1.2.1 +73 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/UserCriterionResolver.java
1.1.2.1 +108 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/StandardProfilingRule.java
1.1.2.1 +47 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/PathSessionResolver.java
1.1.2.1 +66 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/GroupRoleUserCriterionResolver.java
1.1.2.1 +162 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/AbstractProfilingRule.java
1.1.2.1 +73 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/Attic/GroupCriterionResolver.java
No revision
No revision
1.10.2.2 +0 -1
jakarta-jetspeed-2/components/persistence/src/test/org/apache/jetspeed/components/persistence/TestPersistenceContainer.java
Index: TestPersistenceContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/persistence/src/test/org/apache/jetspeed/components/persistence/TestPersistenceContainer.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- TestPersistenceContainer.java 19 Apr 2004 21:08:45 -0000 1.10.2.1
+++ TestPersistenceContainer.java 20 Apr 2004 03:08:48 -0000 1.10.2.2
@@ -14,7 +14,6 @@
* limitations under the License.
*/
package org.apache.jetspeed.components.persistence;
-import java.io.File;
import java.net.MalformedURLException;
import java.util.ArrayList;
No revision
No revision
1.1.2.1 +442 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/CastorXmlPageManager.java
1.1.2.1 +182 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/DatabasePageManager.java
1.1.2.1 +162 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/AbstractPageManager.java
1.1.2.1 +127 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/page-mapping.xml
No revision
No revision
1.1.2.1 +72 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/Attic/ProfileLocatorProperty.java
1.1.2.1 +107 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/Attic/ProfileLocator.java
1.1.2.1 +48 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/Attic/ProfilerException.java
1.1.2.1 +124 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/Attic/Profiler.java
No revision
No revision
1.2.2.1 +4 -4
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestGroupManager.java
Index: TestGroupManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestGroupManager.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TestGroupManager.java 25 Mar 2004 21:39:55 -0000 1.2
+++ TestGroupManager.java 20 Apr 2004 03:08:48 -0000 1.2.2.1
@@ -24,9 +24,8 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.security.impl.GroupPrincipalImpl;
-
import org.picocontainer.MutablePicoContainer;
/**
@@ -82,8 +81,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestGroupManager.class);
-
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestGroupManager.class);
+//
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestGroupManager.class);
return suite;
}
1.5.2.1 +4 -4
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestUserManager.java
Index: TestUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestUserManager.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- TestUserManager.java 25 Mar 2004 21:39:55 -0000 1.5
+++ TestUserManager.java 20 Apr 2004 03:08:48 -0000 1.5.2.1
@@ -24,9 +24,8 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.security.impl.PassiveCallbackHandler;
-
import org.picocontainer.MutablePicoContainer;
/**
@@ -78,8 +77,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestUserManager.class);
-
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestUserManager.class);
+//
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestUserManager.class);
return suite;
}
1.3.2.1 +5 -6
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java
Index: TestRdbmsPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TestRdbmsPolicy.java 25 Mar 2004 21:39:55 -0000 1.3
+++ TestRdbmsPolicy.java 20 Apr 2004 03:08:48 -0000 1.3.2.1
@@ -14,8 +14,8 @@
*/
package org.apache.jetspeed.security;
-import java.security.AccessController;
import java.security.AccessControlException;
+import java.security.AccessController;
import java.security.PrivilegedAction;
import javax.security.auth.Subject;
@@ -25,11 +25,9 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
-import org.apache.jetspeed.security.UserPrincipal;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.security.impl.PassiveCallbackHandler;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
-
import org.picocontainer.MutablePicoContainer;
/**
@@ -112,8 +110,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRdbmsPolicy.class);
-
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRdbmsPolicy.class);
+//
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestRdbmsPolicy.class);
return suite;
}
1.2.2.1 +5 -4
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestSecurityHelper.java
Index: TestSecurityHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestSecurityHelper.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TestSecurityHelper.java 11 Mar 2004 05:04:15 -0000 1.2
+++ TestSecurityHelper.java 20 Apr 2004 03:08:48 -0000 1.2.2.1
@@ -23,7 +23,7 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
/**
@@ -68,8 +68,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestSecurityHelper.class);
-
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestSecurityHelper.class);
+//
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestSecurityHelper.class);
return suite;
}
1.3.2.1 +5 -6
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestLoginModule.java
Index: TestLoginModule.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestLoginModule.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TestLoginModule.java 25 Mar 2004 21:39:55 -0000 1.3
+++ TestLoginModule.java 20 Apr 2004 03:08:48 -0000 1.3.2.1
@@ -22,11 +22,9 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
-import org.apache.jetspeed.security.SecurityHelper;
-import org.apache.jetspeed.security.impl.UserPrincipalImpl;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.security.impl.PassiveCallbackHandler;
-
+import org.apache.jetspeed.security.impl.UserPrincipalImpl;
import org.picocontainer.MutablePicoContainer;
/**
@@ -90,8 +88,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestLoginModule.class);
-
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestLoginModule.class);
+//
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestLoginModule.class);
return suite;
}
1.2.2.1 +4 -4
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java
Index: TestRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TestRoleManager.java 25 Mar 2004 21:39:55 -0000 1.2
+++ TestRoleManager.java 20 Apr 2004 03:08:48 -0000 1.2.2.1
@@ -24,9 +24,8 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
-
import org.picocontainer.MutablePicoContainer;
/**
@@ -86,8 +85,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRoleManager.class);
-
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestRoleManager.class);
+//
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestRoleManager.class);
return suite;
}
1.1.2.1 +6 -6
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestPermissionManager.java
Index: TestPermissionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestPermissionManager.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- TestPermissionManager.java 10 Mar 2004 06:09:25 -0000 1.1
+++ TestPermissionManager.java 20 Apr 2004 03:08:48 -0000 1.1.2.1
@@ -14,20 +14,19 @@
*/
package org.apache.jetspeed.security;
+import java.security.Permission;
+import java.security.Permissions;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
-import java.security.Permission;
-import java.security.Permissions;
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.security.impl.GroupPrincipalImpl;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
-
import org.picocontainer.MutablePicoContainer;
/**
@@ -91,8 +90,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPermissionManager.class);
-
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPermissionManager.class);
+//
suite.setScript("org/apache/jetspeed/security/containers/test.security.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestPermissionManager.class);
return suite;
}
No revision
No revision
1.1.2.1 +61 -0 jakarta-jetspeed-2/components/profiler/Attic/maven.xml
1.1.2.1 +9 -0 jakarta-jetspeed-2/components/profiler/Attic/maven.log
1.1.2.1 +333 -0 jakarta-jetspeed-2/components/profiler/Attic/project.xml
1.1.2.1 +55 -0 jakarta-jetspeed-2/components/profiler/Attic/project.properties
1.1.2.1 +1 -0 jakarta-jetspeed-2/components/profiler/Attic/.cvsignore
No revision
No revision
1.1.2.1 +48 -0
jakarta-jetspeed-2/components/page-manager/src/java/META-INF/Attic/nanocontainer.groovy
No revision
No revision
1.1.2.1 +76 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/Attic/BaseElement.java
1.1.2.1 +100 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/Attic/Page.java
1.1.2.1 +76 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/Attic/Property.java
1.1.2.1 +192 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/Attic/Fragment.java
1.1.2.1 +27 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/Attic/Reference.java
1.1.2.1 +16 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/Attic/package.html
No revision
No revision
1.5.2.2 +17 -0 jakarta-jetspeed-2/components/prefs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.xml,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- project.xml 19 Apr 2004 21:08:45 -0000 1.5.2.1
+++ project.xml 20 Apr 2004 03:08:49 -0000 1.5.2.2
@@ -79,6 +79,20 @@
</properties>
</dependency>
<dependency>
+ <id>commons-vfs</id>
+ <version>SNAPSHOT</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>nanocontainer:nanocontainer-deployer</id>
+ <version>1.0-beta-1-SNAPSHOT</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
<id>junit</id>
<version>3.8.1</version>
<properties>
@@ -234,7 +248,9 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <!--
<unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+
<unitTest>
<includes>
<include>**/Test*.java</include>
@@ -255,6 +271,7 @@
</resource>
</resources>
</unitTest>
+ -->
<resources>
<resource>
1.6.2.1 +6 -1 jakarta-jetspeed-2/components/prefs/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/maven.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- maven.xml 18 Mar 2004 14:38:33 -0000 1.6
+++ maven.xml 20 Apr 2004 03:08:49 -0000 1.6.2.1
@@ -44,6 +44,11 @@
<goal name="build.prefs">
<attainGoal name="ojb.registry"/>
<attainGoal name="jar:install"/>
-</goal>
+ </goal>
+
+ <preGoal name="test:test">
+ <copy todir="${basedir}/target/deploy"
file="${maven.repo.local}/jetspeed2/jars/jetspeed-rdbms-2.0-a1-dev.jar" />
+ <copy todir="${basedir}/target/deploy"
file="${maven.repo.local}/jetspeed2/jars/jetspeed-persistence-2.0-a1-dev.jar" />
+ </preGoal>
</project>
No revision
No revision
1.1.2.1 +367 -0
jakarta-jetspeed-2/components/profiler/src/test/org/apache/jetspeed/profiler/Attic/TestProfiler.java
No revision
No revision
1.1.2.1 +62 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/Attic/PrincipalRule.java
1.1.2.1 +81 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/Attic/RuleCriterionResolver.java
1.1.2.1 +147 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/Attic/ProfilingRule.java
1.1.2.1 +146 -0
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/Attic/RuleCriterion.java
No revision
No revision
1.1.2.1 +69 -0
jakarta-jetspeed-2/components/security/src/java/META-INF/Attic/nanocontainer.groovy
No revision
No revision
1.1.2.1 +278 -0
jakarta-jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/Attic/TestCastorXmlPageManager.java
1.1.2.1 +90 -0
jakarta-jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/Attic/TestDatabasePageManager.java
No revision
No revision
1.1.2.1 +61 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/Attic/Folder.java
No revision
No revision
1.1.2.1 +52 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/desktop/Attic/Desktop.java
No revision
No revision
1.5.2.2 +2 -0 jakarta-jetspeed-2/components/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/project.xml,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- project.xml 19 Apr 2004 21:09:06 -0000 1.5.2.1
+++ project.xml 20 Apr 2004 03:08:50 -0000 1.5.2.2
@@ -267,6 +267,7 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <!--
<unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
<aspectSourceDirectory>src/aop</aspectSourceDirectory>
<unitTest>
@@ -289,6 +290,7 @@
</resource>
</resources>
</unitTest>
+ -->
<resources>
<resource>
No revision
No revision
1.1.2.1 +177 -0
jakarta-jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/om/page/Attic/TestPageObjectModel.java
No revision
No revision
1.1.2.1 +42 -0
jakarta-jetspeed-2/components/page-manager/testdata/pages/Attic/default-page.psml
1.1.2.1 +43 -0
jakarta-jetspeed-2/components/page-manager/testdata/pages/Attic/test001.psml
No revision
No revision
1.11.2.1 +4 -4
jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java
Index: TestPreferences.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- TestPreferences.java 25 Mar 2004 21:40:52 -0000 1.11
+++ TestPreferences.java 20 Apr 2004 03:08:50 -0000 1.11.2.1
@@ -22,10 +22,9 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.prefs.impl.PropertyException;
-
import org.picocontainer.MutablePicoContainer;
/**
@@ -86,8 +85,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPreferences.class);
- suite.setScript("org/apache/jetspeed/prefs/containers/test.prefs.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPreferences.class);
+// suite.setScript("org/apache/jetspeed/prefs/containers/test.prefs.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestPreferences.class);
return suite;
}
1.12.2.1 +4 -4
jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java
Index: TestPropertyManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- TestPropertyManager.java 25 Mar 2004 21:40:52 -0000 1.12
+++ TestPropertyManager.java 20 Apr 2004 03:08:50 -0000 1.12.2.1
@@ -22,10 +22,9 @@
import junit.framework.Test;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
+import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.prefs.impl.PropertyException;
-
import org.picocontainer.MutablePicoContainer;
/**
@@ -86,8 +85,9 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPropertyManager.class);
- suite.setScript("org/apache/jetspeed/prefs/containers/test.prefs.groovy");
+// ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPropertyManager.class);
+// suite.setScript("org/apache/jetspeed/prefs/containers/test.prefs.groovy");
+ NanoDeployerBasedTestSuite suite = new
NanoDeployerBasedTestSuite(TestPropertyManager.class);
return suite;
}
No revision
No revision
1.1.2.1 +52 -0
jakarta-jetspeed-2/components/profiler/src/java/META-INF/Attic/nanocontainer.groovy
No revision
No revision
1.1.2.1 +54 -0
jakarta-jetspeed-2/components/prefs/src/java/META-INF/Attic/nanocontainer.groovy
No revision
No revision
1.1.2.1 +118 -0
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/Attic/FolderImpl.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
