Index: portal/portal-shared-deploy/pom.xml
===================================================================
--- portal/portal-shared-deploy/pom.xml	(revision 306129)
+++ portal/portal-shared-deploy/pom.xml	(working copy)
@@ -19,8 +19,9 @@
     </properties>
 
     <dependencies>
+        <!-- Castor is needed by the pluto implementation -->
         <dependency>
-            <groupId>castor</groupId>
+            <groupId>org.codehaus.castor</groupId>
             <artifactId>castor</artifactId>
             <scope>compile</scope>
         </dependency>
Index: portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/PortalServiceImpl.java
===================================================================
--- portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/PortalServiceImpl.java	(revision 306129)
+++ portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/PortalServiceImpl.java	(working copy)
@@ -110,22 +110,6 @@
 					.get(StyleAbleProvider.class.getName());
 			serverConfigurationService = (ServerConfigurationService) ComponentManager
 					.get(ServerConfigurationService.class.getName());
-
-			try
-			{	
-				// configure the parser for castor.. before anything else get a
-				// chance
-				Properties castorProperties = LocalConfiguration.getDefault();
-				String parser = serverConfigurationService.getString(
-						"sakai.xml.sax.parser",
-						"com.sun.org.apache.xerces.internal.parsers.SAXParser");
-				log.info("Configured Castor to use SAX Parser " + parser);
-				castorProperties.put(Property.Parser, parser);
-			}
-			catch (Exception ex)
-			{
-				log.error("Failed to configure Castor", ex);
-			}
 			
 			portalSkinPrefix = serverConfigurationService.getString(PORTAL_SKIN_NEOPREFIX_PROPERTY, PORTAL_SKIN_NEOPREFIX_DEFAULT);
 			if (portalSkinPrefix == null) {
Index: portal/portal-service-impl/impl/pom.xml
===================================================================
--- portal/portal-service-impl/impl/pom.xml	(revision 306129)
+++ portal/portal-service-impl/impl/pom.xml	(working copy)
@@ -37,10 +37,6 @@
             <artifactId>sakai-portal-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
Index: portal/portal-api/api/src/bundle/castor_eu.properties
===================================================================
--- portal/portal-api/api/src/bundle/castor_eu.properties	(revision 306129)
+++ portal/portal-api/api/src/bundle/castor_eu.properties	(working copy)
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2008 Sakai Foundation
-#
-# Licensed under the Educational Community 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.osedu.org/licenses/ECL-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.
-# 
-
-# This is here to make certain that Castor uses the correct parsers
-# Hence it needs to be in shared sho that it is used by the  castor jar also in shared
-
-
-org.exolab.castor.parser.validation=faltsua
-org.exolab.castor.parser.namespaces=faltsua
-org.exolab.castor.indent=egiazkoa
-org.exolab.castor.debug=faltsua
-#org.exolab.castor.parser=com.sun.org.apache.xerces.internal.parsers.SAXParser
-org.exolab.castor.xml.naming=mistoa
-
-# The above settings work for Castor 1.0 and JDK 1.5
-# If we upgrade to 1.1 we may need teh below settings (which do the same thing)
-# I have tested this on Tigeer 10.4 with JDK 1.5.0_7
-## Defines the (default) XML serializer factory to use by Castor, which must
-# implement org.exolab.castor.xml.SerializerFactory; default is
-# org.exolab.castor.xml.XercesXMLSerializerFactory
-# org.exolab.castor.xml.serializer.factory=org.sakai.portal.api.XMLSerializerFactory
-
Index: portal/portal-api/api/src/bundle/castor.properties
===================================================================
--- portal/portal-api/api/src/bundle/castor.properties	(revision 306129)
+++ portal/portal-api/api/src/bundle/castor.properties	(working copy)
@@ -1,18 +0,0 @@
-# This is here to make certain that Castor uses the correct parsers
-# Hence it needs to be in shared sho that it is used by the  castor jar also in shared
-
-
-org.exolab.castor.parser.validation=false
-org.exolab.castor.parser.namespaces=false
-org.exolab.castor.indent=true
-org.exolab.castor.debug=false
-#org.exolab.castor.parser=com.sun.org.apache.xerces.internal.parsers.SAXParser
-org.exolab.castor.xml.naming=mixed
-
-# The above settings work for Castor 1.0 and JDK 1.5
-# If we upgrade to 1.1 we may need teh below settings (which do the same thing)
-# I have tested this on Tigeer 10.4 with JDK 1.5.0_7
-## Defines the (default) XML serializer factory to use by Castor, which must
-# implement org.exolab.castor.xml.SerializerFactory; default is
-# org.exolab.castor.xml.XercesXMLSerializerFactory
-# org.exolab.castor.xml.serializer.factory=org.sakai.portal.api.XMLSerializerFactory
Index: master/pom.xml
===================================================================
--- master/pom.xml	(revision 306129)
+++ master/pom.xml	(working copy)
@@ -608,9 +608,9 @@
       </dependency>
       <!-- shared/lib -->
       <dependency>
-        <groupId>castor</groupId>
+        <groupId>org.codehaus.castor</groupId>
         <artifactId>castor</artifactId>
-        <version>1.0</version>
+        <version>1.1.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>