Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org Received: (qmail 19849 invoked from network); 18 Jan 2005 01:19:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 18 Jan 2005 01:19:26 -0000 Received: (qmail 92804 invoked by uid 500); 18 Jan 2005 01:19:24 -0000 Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org Received: (qmail 92773 invoked by uid 500); 18 Jan 2005 01:19:24 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 92760 invoked by uid 500); 18 Jan 2005 01:19:24 -0000 Received: (qmail 92756 invoked by uid 99); 18 Jan 2005 01:19:24 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 17 Jan 2005 17:19:24 -0800 Received: (qmail 19833 invoked by uid 1558); 18 Jan 2005 01:19:23 -0000 Date: 18 Jan 2005 01:19:23 -0000 Message-ID: <20050118011923.19832.qmail@minotaur.apache.org> From: morciuch@apache.org To: jakarta-jetspeed-cvs@apache.org Subject: cvs commit: jakarta-jetspeed/src/test/org/apache/jetspeed/services/registry TestCastor.java TestMarshallRegistry.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N morciuch 2005/01/17 17:19:22 Modified: src/test/org/apache/jetspeed/services/psmlmanager TestMarshalPsml.java src/test/org/apache/jetspeed/services/registry TestCastor.java TestMarshallRegistry.java Log: Applying a patch by Bjorn Vidar Remme to synchronize access to mappings for psml manager, registry and forwarding service (see issue http://issues.apache.org/jira/browse/JS1-526) Revision Changes Path 1.3 +8 -7 jakarta-jetspeed/src/test/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java Index: TestMarshalPsml.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/test/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestMarshalPsml.java 31 Aug 2004 19:00:07 -0000 1.2 +++ TestMarshalPsml.java 18 Jan 2005 01:19:22 -0000 1.3 @@ -51,6 +51,7 @@ import org.apache.jetspeed.om.profile.Skin; import org.apache.jetspeed.om.profile.Security; import org.apache.jetspeed.test.JetspeedTestCase; +import org.apache.jetspeed.util.SynchronizedMapping; // Turbine imports import org.apache.turbine.util.TurbineConfig; @@ -121,7 +122,7 @@ try { FileReader reader = new FileReader(psmlFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource( new FileReader(map) ); is.setSystemId( mapFile ); mapping.loadMapping( is ); @@ -179,7 +180,7 @@ try { FileReader reader = new FileReader(psmlFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource( new FileReader(map) ); is.setSystemId( mapFile ); mapping.loadMapping( is ); @@ -381,7 +382,7 @@ try { FileReader reader = new FileReader(psmlFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource( new FileReader(map) ); is.setSystemId( mapFile ); mapping.loadMapping( is ); @@ -423,7 +424,7 @@ if (map.exists() && map.isFile() && map.canRead()) { FileReader reader = new FileReader(psmlFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource( new FileReader(map) ); is.setSystemId( mapFile ); mapping.loadMapping( is ); @@ -486,7 +487,7 @@ try { FileReader reader = new FileReader(psmlFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource( new FileReader(map) ); is.setSystemId( mapFile ); mapping.loadMapping( is ); @@ -567,7 +568,7 @@ try { FileReader reader = new FileReader(psmlFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource( new FileReader(map) ); is.setSystemId( mapFile ); mapping.loadMapping( is ); 1.2 +3 -2 jakarta-jetspeed/src/test/org/apache/jetspeed/services/registry/TestCastor.java Index: TestCastor.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/test/org/apache/jetspeed/services/registry/TestCastor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestCastor.java 7 Apr 2004 22:02:42 -0000 1.1 +++ TestCastor.java 18 Jan 2005 01:19:22 -0000 1.2 @@ -22,6 +22,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.jetspeed.test.JetspeedTestCase; +import org.apache.jetspeed.util.SynchronizedMapping; import org.exolab.castor.mapping.Mapping; import org.exolab.castor.xml.Unmarshaller; import org.w3c.dom.Document; @@ -60,7 +61,7 @@ File map = new File(mapFile); try { - Mapping mapping = new Mapping(); + Mapping mapping = new SynchronizedMapping(); InputSource is = new InputSource(new FileReader(map)); is.setSystemId(mapFile); mapping.loadMapping(is); 1.3 +6 -5 jakarta-jetspeed/src/test/org/apache/jetspeed/services/registry/TestMarshallRegistry.java Index: TestMarshallRegistry.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/test/org/apache/jetspeed/services/registry/TestMarshallRegistry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestMarshallRegistry.java 31 Aug 2004 19:00:07 -0000 1.2 +++ TestMarshallRegistry.java 18 Jan 2005 01:19:22 -0000 1.3 @@ -35,6 +35,7 @@ // Jetspeed imports import org.apache.jetspeed.test.JetspeedTestCase; +import org.apache.jetspeed.util.SynchronizedMapping; import org.apache.jetspeed.om.registry.CachedParameter; import org.apache.jetspeed.om.registry.Category; import org.apache.jetspeed.om.registry.ContentURL; @@ -119,7 +120,7 @@ try { FileReader reader = new FileReader(xregFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource(new FileReader(map)); is.setSystemId(mapFile); mapping.loadMapping(is); @@ -323,7 +324,7 @@ if (map.exists() && map.isFile() && map.canRead()) { FileReader reader = new FileReader(xregFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource(new FileReader(map)); is.setSystemId(mapFile); mapping.loadMapping(is); @@ -429,7 +430,7 @@ if (map.exists() && map.isFile() && map.canRead()) { FileReader reader = new FileReader(xregFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource(new FileReader(map)); is.setSystemId(mapFile); mapping.loadMapping(is); @@ -515,7 +516,7 @@ try { FileReader reader = new FileReader(xregFile); - mapping = new Mapping(); + mapping = new SynchronizedMapping(); InputSource is = new InputSource(new FileReader(map)); is.setSystemId(mapFile); mapping.loadMapping(is); --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org