diff --git a/.classpath b/.classpath
index 6787456140..6076293480 100644
--- a/.classpath
+++ b/.classpath
@@ -8,8 +8,6 @@
-
-
@@ -36,8 +34,8 @@
-
-
+
+
@@ -53,7 +51,7 @@
-
+
@@ -72,8 +70,8 @@
-
-
+
+
diff --git a/adapters/cas/project.xml b/adapters/cas/project.xml
index 2b17e66aa3..005b104e8e 100644
--- a/adapters/cas/project.xml
+++ b/adapters/cas/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - CAS adapter
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-cas
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/cas/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/cas/
diff --git a/adapters/catalina/project.xml b/adapters/catalina/project.xml
index 590da8292a..8c18feddea 100644
--- a/adapters/catalina/project.xml
+++ b/adapters/catalina/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Catalina adapter
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-catalina
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/catalina/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/catalina/
diff --git a/adapters/jboss/project.xml b/adapters/jboss/project.xml
index ff11168640..b93e22b48e 100644
--- a/adapters/jboss/project.xml
+++ b/adapters/jboss/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - JBoss adapter
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-jboss
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/jboss/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/jboss/
diff --git a/adapters/jetty/project.xml b/adapters/jetty/project.xml
index 1d3b52fe2a..bfc1e92756 100644
--- a/adapters/jetty/project.xml
+++ b/adapters/jetty/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Jetty adapter
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-jetty
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/jetty/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/jetty/
diff --git a/adapters/project.xml b/adapters/project.xml
index 6d0464abeb..367193e714 100644
--- a/adapters/project.xml
+++ b/adapters/project.xml
@@ -5,9 +5,9 @@
acegi-security-adapters
Acegi Security System for Spring - Adapters
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/
diff --git a/adapters/resin/project.xml b/adapters/resin/project.xml
index b0c6c9408b..f05bf32843 100644
--- a/adapters/resin/project.xml
+++ b/adapters/resin/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Resin adapter
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-resin
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/resin/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/adapters/resin/
diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 0e9d860c02..7e08a6afb2 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -9,9 +9,9 @@
Acegi Security System for Spring - Java 5 (Tiger)
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core-tiger
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core-tiger
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/core-tiger/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core-tiger
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core-tiger
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/core-tiger/
@@ -23,7 +23,7 @@
org.springframework
spring-aop
- 1.2.7
+ 2.0.4
@@ -50,4 +50,4 @@
-
\ No newline at end of file
+
diff --git a/core-tiger/project.xml b/core-tiger/project.xml
index 30473ed3da..20cf22aee3 100644
--- a/core-tiger/project.xml
+++ b/core-tiger/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Java 5 (Tiger)
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-tiger
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/core-tiger/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/core-tiger/
diff --git a/core/src/main/java/org/acegisecurity/config/AuthenticationRepositoryBeanDefinitionParser.java b/core/src/main/java/org/acegisecurity/config/AuthenticationRepositoryBeanDefinitionParser.java
index 0993114955..57f2c79be7 100644
--- a/core/src/main/java/org/acegisecurity/config/AuthenticationRepositoryBeanDefinitionParser.java
+++ b/core/src/main/java/org/acegisecurity/config/AuthenticationRepositoryBeanDefinitionParser.java
@@ -113,7 +113,7 @@ public class AuthenticationRepositoryBeanDefinitionParser extends AbstractBeanDe
repositoryBeanDef.getPropertyValues().addPropertyValue(property, new RuntimeBeanReference(reference));
}
else {
- doSetInnerBeanDefinitions(repositoryBeanDef, element);
+ doSetInnerBeanDefinitions(repositoryBeanDef, element,property);
}
}
@@ -121,8 +121,9 @@ public class AuthenticationRepositoryBeanDefinitionParser extends AbstractBeanDe
*
* @param repositoryBeanDef
* @param element
+ * @param property
*/
- private void doSetInnerBeanDefinitions(RootBeanDefinition repositoryBeanDef, Element element) {
+ private void doSetInnerBeanDefinitions(RootBeanDefinition repositoryBeanDef, Element element, String property) {
NodeList children = element.getChildNodes();
for (int i = 0, n = children.getLength(); i < n; i++) {
Node node = children.item(i);
@@ -133,15 +134,15 @@ public class AuthenticationRepositoryBeanDefinitionParser extends AbstractBeanDe
if (SYSTEM_WIDE_SALT_SOURCE.equals(node.getLocalName())) {
innerBeanDefinition = createSystemWideSaltSource(childElement);
- repositoryBeanDef.getPropertyValues().addPropertyValue("saltSource", innerBeanDefinition);
+ repositoryBeanDef.getPropertyValues().addPropertyValue(property, innerBeanDefinition);
}
else if (REFLECTION_SALT_SOURCE.equals(node.getLocalName())) {
innerBeanDefinition = createReflectionSaltSource(childElement);
- repositoryBeanDef.getPropertyValues().addPropertyValue("saltSource", innerBeanDefinition);
+ repositoryBeanDef.getPropertyValues().addPropertyValue(property, innerBeanDefinition);
}
if (PASSWORD_ENCODER.equals(node.getLocalName())) {
RootBeanDefinition passwordEncoderInnerBeanDefinition = createPasswordEncoder(childElement);
- repositoryBeanDef.getPropertyValues().addPropertyValue("passwordEncoder", passwordEncoderInnerBeanDefinition);
+ repositoryBeanDef.getPropertyValues().addPropertyValue(property, passwordEncoderInnerBeanDefinition);
}
}
}
diff --git a/core/src/main/java/org/acegisecurity/config/SecurityNamespaceHandler.java b/core/src/main/java/org/acegisecurity/config/SecurityNamespaceHandler.java
index 7a528ac79e..2b922f8a51 100644
--- a/core/src/main/java/org/acegisecurity/config/SecurityNamespaceHandler.java
+++ b/core/src/main/java/org/acegisecurity/config/SecurityNamespaceHandler.java
@@ -19,6 +19,7 @@ public class SecurityNamespaceHandler extends NamespaceHandlerSupport {
* 'context-integration', ' and '' elements.
*/
public void init() {
+ registerBeanDefinitionParser("principal-repository", new PrincipalRepositoryBeanDefinitionParser());
registerBeanDefinitionParser("session-context-integration", new ContextIntegrationBeanDefinitionParser());
registerBeanDefinitionParser("authentication-repository", new AuthenticationRepositoryBeanDefinitionParser());
registerBeanDefinitionParser("authentication-mechanism", new AuthenticationMechanismBeanDefinitionParser());
diff --git a/core/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd b/core/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd
index b5d0d6f27e..7aeb607ffc 100644
--- a/core/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd
+++ b/core/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd
@@ -101,10 +101,10 @@
-
+
-
+
@@ -118,20 +118,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -143,16 +144,55 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java b/core/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java
index e0ab90af94..b9d82b8633 100644
--- a/core/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java
+++ b/core/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java
@@ -8,9 +8,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class RememberMeBeanDefinitionParserTest extends TestCase {
public void testRememberMeDefaults() {
- ApplicationContext context = new ClassPathXmlApplicationContext("org/acegisecurity/config/remember-me-defaults.xml");
-
-
+ ApplicationContext context = new ClassPathXmlApplicationContext("org/acegisecurity/config/principal-defaults.xml");
}
}
diff --git a/core/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml b/core/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml
index 7355a57abd..fc11aa49fa 100644
--- a/core/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml
+++ b/core/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml
@@ -29,7 +29,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
Every authentication mechanism OR provider must start with security:authentication-something
Use appropriate attrs and elements depending on provider or mechanism
-->
-
+
@@ -37,18 +37,20 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
- -->
+
+
-
diff --git a/doc/pom.xml b/doc/pom.xml
index 2b230d38b6..906ff7572c 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -12,9 +12,9 @@
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/
diff --git a/doc/project.xml b/doc/project.xml
index b9526cde93..dd0e538306 100644
--- a/doc/project.xml
+++ b/doc/project.xml
@@ -6,8 +6,8 @@
Acegi Security System for Spring
acegi-security-doc
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/doc/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/doc/
diff --git a/project.xml b/project.xml
index e695964c80..bebe826da9 100644
--- a/project.xml
+++ b/project.xml
@@ -38,9 +38,9 @@
shell.sf.net
/home/groups/a/ac/acegisecurity/htdocs/maven
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/
diff --git a/samples/acegifier/project.xml b/samples/acegifier/project.xml
index 136e65f2d1..6f37e19c58 100644
--- a/samples/acegifier/project.xml
+++ b/samples/acegifier/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Acegifier sample
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-acegifier
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/acegifier/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/acegifier/
diff --git a/samples/annotations/pom.xml b/samples/annotations/pom.xml
index c4e0cfbeb9..f4466399dd 100644
--- a/samples/annotations/pom.xml
+++ b/samples/annotations/pom.xml
@@ -10,7 +10,13 @@
acegi-security-sample-annotations
Acegi Security System for Spring - Annotations sample
-
+
+
+ org.acegisecurity
+ acegi-security-tiger
+ ${project.version}
+ jar
+
diff --git a/samples/annotations/project.xml b/samples/annotations/project.xml
index 37a86772fe..86a8adec54 100644
--- a/samples/annotations/project.xml
+++ b/samples/annotations/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Annotations sample
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-annotations
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/annotations/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/annotations/
diff --git a/samples/attributes/pom.xml b/samples/attributes/pom.xml
index 7046876517..b514279b47 100644
--- a/samples/attributes/pom.xml
+++ b/samples/attributes/pom.xml
@@ -11,5 +11,32 @@
acegi-security-sample-attributes
Acegi Security System for Spring - Attributes sample
+
+ xdoclet
+ xjavadoc
+ 1.0.2
+
+
+ commons-collections
+ commons-collections
+ 3.1
+
+
+ commons-attributes
+ commons-attributes-compiler
+ 2.1
+
+
+ commons-attributes
+ commons-attributes-api
+ 2.1
+
+
+ commons-attributes
+ commons-attributes-plugin
+ 2.1
+ plugin
+
+
diff --git a/samples/attributes/project.xml b/samples/attributes/project.xml
index 1ad2d3be35..73c3b911c8 100644
--- a/samples/attributes/project.xml
+++ b/samples/attributes/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Attributes sample
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-attributes
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/attributes/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/attributes/
diff --git a/samples/contacts-tiger/pom.xml b/samples/contacts-tiger/pom.xml
index e4c75a7171..dd1b4fc553 100644
--- a/samples/contacts-tiger/pom.xml
+++ b/samples/contacts-tiger/pom.xml
@@ -18,4 +18,18 @@
${project.version}
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 1.5
+ 1.5
+
+
+
+
+
diff --git a/samples/contacts-tiger/project.xml b/samples/contacts-tiger/project.xml
index 476faabe27..feaf5a7a0c 100644
--- a/samples/contacts-tiger/project.xml
+++ b/samples/contacts-tiger/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Contacts sample (Java 5)
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-contacts-tiger
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/contacts-tiger/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/contacts-tiger/
diff --git a/samples/contacts/project.xml b/samples/contacts/project.xml
index ae541d52d7..4acd7ada21 100644
--- a/samples/contacts/project.xml
+++ b/samples/contacts/project.xml
@@ -6,9 +6,9 @@
Acegi Security System for Spring - Contacts sample
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-contacts
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/contacts/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/contacts/
diff --git a/samples/project.xml b/samples/project.xml
index b18f871e41..cc130691ac 100644
--- a/samples/project.xml
+++ b/samples/project.xml
@@ -3,9 +3,9 @@
${basedir}/../project.xml
3
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/
diff --git a/samples/tutorial/project.xml b/samples/tutorial/project.xml
index 127f32b37a..ab21b68235 100644
--- a/samples/tutorial/project.xml
+++ b/samples/tutorial/project.xml
@@ -6,8 +6,8 @@
Acegi Security System for Spring - Tutorial sample
/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-tutorial
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
- http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/tutorial/
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity
+ http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/samples/tutorial/