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 2008/09/15 18:00:00 UTC
svn commit: r695517 - in
/portals/jetspeed-2/portal/branches/security-refactoring: ./
applications/jetspeed-dependencies/ components/
components/jetspeed-db-tools/ components/jetspeed-portal/
components/jetspeed-portal/src/test/java/org/apache/jetspeed...
Author: ate
Date: Mon Sep 15 08:59:58 2008
New Revision: 695517
URL: http://svn.apache.org/viewvc?rev=695517&view=rev
Log:
bye bye Java Preferences
Added:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java (with props)
Removed:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-prefs/
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/prefs/FailedToCreateNodeException.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/prefs/NodeAlreadyExistsException.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/prefs/NodeDoesNotExistException.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/prefs/PreferencesException.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/prefs/PreferencesProvider.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/prefs/om/
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/prefs/package.html
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-dependencies/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-db-tools/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-sso/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/pom.xml
Modified: portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-dependencies/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-dependencies/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-dependencies/pom.xml Mon Sep 15 08:59:58 2008
@@ -53,10 +53,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-prefs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-search</artifactId>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-db-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-db-tools/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-db-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-db-tools/pom.xml Mon Sep 15 08:59:58 2008
@@ -79,10 +79,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-prefs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-search</artifactId>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/pom.xml Mon Sep 15 08:59:58 2008
@@ -60,10 +60,6 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-prefs</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-registry</artifactId>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java Mon Sep 15 08:59:58 2008
@@ -23,10 +23,10 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+import org.apache.jetspeed.components.util.TransactionCacheEnabledSpringTestCase;
import org.apache.jetspeed.om.common.JetspeedServiceReference;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
-import org.apache.jetspeed.prefs.util.test.AbstractPrefsSupportedTestCase;
import org.apache.jetspeed.util.descriptor.ExtendedPortletMetadata;
import org.apache.jetspeed.util.descriptor.PortletApplicationDescriptor;
@@ -38,8 +38,8 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public class TestJetspeedPortletDescriptor
- extends AbstractPrefsSupportedTestCase {
+public class TestJetspeedPortletDescriptor extends TransactionCacheEnabledSpringTestCase
+{
private static final String PORTLET_01 = "HelloPortlet";
private static final String PORTLET_02 = "DisplayRequestPortlet";
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-profiler/pom.xml Mon Sep 15 08:59:58 2008
@@ -113,7 +113,7 @@
<resources>
<resource>
<path>assembly</path>
- <include>profiler.xml,transaction.xml,prefs.xml,cache.xml,security-*.xml,boot/datasource.xml</include>
+ <include>profiler.xml,transaction.xml,cache.xml,security-*.xml,boot/datasource.xml</include>
</resource>
<resource>
<path>db-ojb</path>
Added: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java?rev=695517&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java (added)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java Mon Sep 15 08:59:58 2008
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package org.apache.jetspeed.components.util;
+
+/**
+ * @version $Id$
+ *
+ */
+public class TransactionCacheEnabledSpringTestCase extends DatasourceEnabledSpringTestCase
+{
+ protected String[] getConfigurations()
+ {
+ return new String[]
+ { "transaction.xml", "cache.xml" };
+ }
+}
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/TransactionCacheEnabledSpringTestCase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml Mon Sep 15 08:59:58 2008
@@ -60,10 +60,6 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-prefs</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-search</artifactId>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java Mon Sep 15 08:59:58 2008
@@ -25,17 +25,15 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Properties;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.prefs.util.test.AbstractPrefsSupportedTestCase;
/**
* @author <a href="mailto:sweaver@einnovation.com">Scott T. Weaver</a>
*
*/
-public abstract class RegistrySupportedTestCase extends AbstractPrefsSupportedTestCase
+public abstract class RegistrySupportedTestCase extends TransactionCacheEnabledSpringTestCase
{
protected PortletRegistry portletRegistry;
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/pom.xml Mon Sep 15 08:59:58 2008
@@ -56,10 +56,6 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-prefs</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-serializer</artifactId>
</dependency>
<dependency>
@@ -160,7 +156,7 @@
<resources>
<resource>
<path>assembly</path>
- <include>prefs.xml,transaction.xml,cache.xml,security-*.xml,boot/datasource.xml</include>
+ <include>transaction.xml,cache.xml,security-*.xml,boot/datasource.xml</include>
</resource>
<resource>
<path>db-ojb</path>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-sso/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-sso/pom.xml Mon Sep 15 08:59:58 2008
@@ -103,7 +103,7 @@
<resources>
<resource>
<path>assembly</path>
- <include>prefs.xml,sso.xml,transaction.xml,cache.xml,security-*.xml</include>
+ <include>sso.xml,transaction.xml,cache.xml,security-*.xml</include>
</resource>
<resource>
<path>db-ojb</path>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/pom.xml Mon Sep 15 08:59:58 2008
@@ -47,7 +47,6 @@
<module>jetspeed-portal</module>
<module>jetspeed-portal-site</module>
<module>jetspeed-portlet-factory</module>
- <module>jetspeed-prefs</module>
<module>jetspeed-profiler</module>
<module>jetspeed-rdbms</module>
<module>jetspeed-registry</module>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/pom.xml?rev=695517&r1=695516&r2=695517&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/pom.xml Mon Sep 15 08:59:58 2008
@@ -413,11 +413,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-prefs</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-search</artifactId>
<version>${pom.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org