From 1467527c0a4c746c21be897cb41a8e07474d92c9 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Wed, 29 Aug 2007 11:00:28 +0000 Subject: [PATCH] SEC-538: Deleted maven 1 files. --- adapters/cas/maven.xml | 39 -- adapters/cas/project.xml | 43 -- adapters/catalina/maven.xml | 39 -- adapters/catalina/project.xml | 62 --- adapters/jboss/maven.xml | 39 -- adapters/jboss/project.xml | 61 --- adapters/jetty/maven.xml | 39 -- adapters/jetty/project.xml | 48 --- adapters/project.xml | 25 -- adapters/resin/maven.xml | 39 -- adapters/resin/project.xml | 66 --- core-tiger/maven.xml | 39 -- core-tiger/project.properties | 12 - core-tiger/project.xml | 42 -- core/maven.xml | 40 -- core/project.xml | 44 -- doc/deploy.bat | 5 - doc/maven.xml | 169 -------- doc/project.properties | 18 - doc/project.xml | 30 -- doc/xdocs/building.xml | 87 ++-- doc/xdocs/policies.xml | 6 +- maven.xml | 53 --- project.properties | 86 ---- project.xml | 571 ------------------------- samples/annotations/maven.xml | 6 - samples/annotations/project.properties | 9 - samples/annotations/project.xml | 22 - samples/attributes/maven.xml | 8 - samples/attributes/project.properties | 10 - samples/attributes/project.xml | 42 -- samples/contacts/maven.xml | 75 ---- samples/contacts/project.properties | 25 -- samples/contacts/project.xml | 36 -- samples/project.xml | 24 -- samples/tutorial/project.properties | 3 - samples/tutorial/project.xml | 13 - src/site/resources/policies.html | 4 +- 38 files changed, 38 insertions(+), 1941 deletions(-) delete mode 100644 adapters/cas/maven.xml delete mode 100644 adapters/cas/project.xml delete mode 100644 adapters/catalina/maven.xml delete mode 100644 adapters/catalina/project.xml delete mode 100644 adapters/jboss/maven.xml delete mode 100644 adapters/jboss/project.xml delete mode 100644 adapters/jetty/maven.xml delete mode 100644 adapters/jetty/project.xml delete mode 100644 adapters/project.xml delete mode 100644 adapters/resin/maven.xml delete mode 100644 adapters/resin/project.xml delete mode 100644 core-tiger/maven.xml delete mode 100644 core-tiger/project.properties delete mode 100644 core-tiger/project.xml delete mode 100644 core/maven.xml delete mode 100644 core/project.xml delete mode 100644 doc/deploy.bat delete mode 100644 doc/maven.xml delete mode 100644 doc/project.properties delete mode 100644 doc/project.xml delete mode 100755 maven.xml delete mode 100644 project.properties delete mode 100644 project.xml delete mode 100644 samples/annotations/maven.xml delete mode 100644 samples/annotations/project.properties delete mode 100644 samples/annotations/project.xml delete mode 100644 samples/attributes/maven.xml delete mode 100644 samples/attributes/project.properties delete mode 100644 samples/attributes/project.xml delete mode 100644 samples/contacts/maven.xml delete mode 100644 samples/contacts/project.properties delete mode 100644 samples/contacts/project.xml delete mode 100644 samples/project.xml delete mode 100644 samples/tutorial/project.properties delete mode 100644 samples/tutorial/project.xml diff --git a/adapters/cas/maven.xml b/adapters/cas/maven.xml deleted file mode 100644 index 559267c1d7..0000000000 --- a/adapters/cas/maven.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - signature.alias defined; signing JAR(s)... - - - - - - - - - diff --git a/adapters/cas/project.xml b/adapters/cas/project.xml deleted file mode 100644 index 005b104e8e..0000000000 --- a/adapters/cas/project.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-cas - Acegi Security System for Spring - CAS adapter - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-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/ - - - - cas - cas - 2.0.12 - jar - http://www.yale.edu/tp/cas - - - - cas - cas-server - 3.0.4 - jar - http://www.ja-sig.org/products/cas/ - - - - - - ${basedir}/../../ - META-INF - - notice.txt - - false - - - - - diff --git a/adapters/catalina/maven.xml b/adapters/catalina/maven.xml deleted file mode 100644 index 559267c1d7..0000000000 --- a/adapters/catalina/maven.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - signature.alias defined; signing JAR(s)... - - - - - - - - - diff --git a/adapters/catalina/project.xml b/adapters/catalina/project.xml deleted file mode 100644 index 8c18feddea..0000000000 --- a/adapters/catalina/project.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-catalina - Acegi Security System for Spring - Catalina adapter - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-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/ - - - - tomcat - catalina - 4.1.9 - jar - - - - - - **/*Tests.java - - - - - ${basedir}/src/main/resources - - **/** - - false - - - - - - ${basedir}/../../ - META-INF - - notice.txt - - false - - - - - - diff --git a/adapters/jboss/maven.xml b/adapters/jboss/maven.xml deleted file mode 100644 index 559267c1d7..0000000000 --- a/adapters/jboss/maven.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - signature.alias defined; signing JAR(s)... - - - - - - - - - diff --git a/adapters/jboss/project.xml b/adapters/jboss/project.xml deleted file mode 100644 index b93e22b48e..0000000000 --- a/adapters/jboss/project.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-jboss - Acegi Security System for Spring - JBoss adapter - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-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/ - - - - jboss - jboss-common - 3.2.3 - jar - - - jboss - jbosssx - 3.2.3 - jar - - - - - - **/*Tests.java - - - - ${basedir}/../../ - META-INF - - notice.txt - - false - - - ${basedir}/../../core/src/main/resources - - **/** - - false - - - - - - ${basedir}/../../ - META-INF - - notice.txt - - false - - - - \ No newline at end of file diff --git a/adapters/jetty/maven.xml b/adapters/jetty/maven.xml deleted file mode 100644 index 559267c1d7..0000000000 --- a/adapters/jetty/maven.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - signature.alias defined; signing JAR(s)... - - - - - - - - - diff --git a/adapters/jetty/project.xml b/adapters/jetty/project.xml deleted file mode 100644 index bfc1e92756..0000000000 --- a/adapters/jetty/project.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-jetty - Acegi Security System for Spring - Jetty adapter - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-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/ - - - - jetty - org.mortbay.jetty - 4.2.22 - jar - - - - - - **/*Tests.java - - - - ${basedir}/../../core/src/main/resources - - **/** - - false - - - - - - ${basedir}/../../ - META-INF - - notice.txt - - false - - - - - diff --git a/adapters/project.xml b/adapters/project.xml deleted file mode 100644 index 9a01a31342..0000000000 --- a/adapters/project.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-adapters - Acegi Security System for Spring - 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/ - - - - org.acegisecurity - acegi-security - 1.0.4 - jar - http://acegisecurity.org - - true - - - - - diff --git a/adapters/resin/maven.xml b/adapters/resin/maven.xml deleted file mode 100644 index 559267c1d7..0000000000 --- a/adapters/resin/maven.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - signature.alias defined; signing JAR(s)... - - - - - - - - - diff --git a/adapters/resin/project.xml b/adapters/resin/project.xml deleted file mode 100644 index f05bf32843..0000000000 --- a/adapters/resin/project.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-resin - Acegi Security System for Spring - Resin adapter - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-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/ - - - - com.caucho - resin - 3.0.9 - - - net.sourceforge.retroweaver - retroweaver - 1.0fcs - - - - - - **/*Tests.java - - - - ${basedir}/../../core/src/test/resources - - **/** - - false - - - ${basedir}/../../core/src/main/resources - - **/** - - false - - - - - - ${basedir}/../../ - META-INF - - notice.txt - - false - - - - - - diff --git a/core-tiger/maven.xml b/core-tiger/maven.xml deleted file mode 100644 index 89017035e2..0000000000 --- a/core-tiger/maven.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - signature.alias defined; signing JAR(s)... - - - - - - - - - diff --git a/core-tiger/project.properties b/core-tiger/project.properties deleted file mode 100644 index 59d5d1056e..0000000000 --- a/core-tiger/project.properties +++ /dev/null @@ -1,12 +0,0 @@ -# $Id$ - -# Values in this file will be overriden by any values with the same name -# in the user-created build.properties file. - -# Compile settings -# -# Java 1.5 is required due to the use of annotations for metadata. -# (main Acegi Security project / parent) is Java 1.3 compatible -# -maven.compile.target=1.5 -maven.compile.source=1.5 diff --git a/core-tiger/project.xml b/core-tiger/project.xml deleted file mode 100644 index 82a75c777f..0000000000 --- a/core-tiger/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-tiger - Acegi Security System for Spring - Java 5 (Tiger) - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-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/ - - - - org.acegisecurity - acegi-security - 1.0.5-SNAPSHOT - jar - - - - - - ${basedir}/src/main/resources/ - / - - *.xsl - - false - - - ${basedir}/../ - META-INF - - notice.txt - - false - - - - - diff --git a/core/maven.xml b/core/maven.xml deleted file mode 100644 index 43aec12a3a..0000000000 --- a/core/maven.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - signature.alias defined; signing JAR(s)... - - - - - - - - - - diff --git a/core/project.xml b/core/project.xml deleted file mode 100644 index 36c1e52d6c..0000000000 --- a/core/project.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - ${basedir}/../project.xml - 3 - org.acegisecurity - acegi-security - Acegi Security System for Spring - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security - - 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/ - - - - - ${basedir}/../ - META-INF - - notice.txt - - false - - - ${basedir}/src/main/resources/org/acegisecurity/taglibs - META-INF - - *.tld - - false - - - ${basedir}/src/main/resources/ - / - - *.xsl - **/*.properties - - false - - - - - diff --git a/doc/deploy.bat b/doc/deploy.bat deleted file mode 100644 index 6a818b5fe2..0000000000 --- a/doc/deploy.bat +++ /dev/null @@ -1,5 +0,0 @@ -set MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=512m -call maven -Dmaven.jar.override=on -Dmaven.jar.clover-ant=1.3.3_01 clean -call maven -Dmaven.jar.override=on -Dmaven.jar.clover-ant=1.3.3_01 multiproject:clean -call maven -Dmaven.jar.override=on -Dmaven.jar.clover-ant=1.3.3_01 multiproject:artifact -call maven -Dmaven.jar.override=on -Dmaven.jar.clover-ant=1.3.3_01 multiproject:site \ No newline at end of file diff --git a/doc/maven.xml b/doc/maven.xml deleted file mode 100644 index 63dcc2af05..0000000000 --- a/doc/maven.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ------------------------------------------------------------ - ACEGI SECURITY OFFICIAL RELEASE ZIP CREATION ------------------------------------------------------------ - -First check the following are valid build properties: - - Using keystore...: ${signature.keystore} - Using storepass..: ${signature.storepass} - Using alias......: ${signature.alias} - -The procedure to generate an official release ZIP is: - - 0. In the core and core-tiger, do a maven clean then jar:install - 1. cd ACEGI_SECURITY/docs - 2. maven clean multiproject:clean multiproject:artifact - 3. maven -Dmaven.jar.override=on -Dmaven.jar.clover-ant=1.3.3_0 multiproject:site - 4. maven acegizip - 5. check ACEGI_SECURITY/target/*.zip looks correct - 6. maven site:sshdeploy - 7. ftp the ACEGI_SECURITY/target/*.zip to SourceForge - 8. release the FTPed file via the File Release System - -Failure to follow this procedure will cause out-of-date -content (or missing content) in the official release ZIP. - -It would be nice if a single goal could do all this, but -Maven throws an OutOfMemoryError. :-( - - - - - - - - - - - - - - - - - - - diff --git a/doc/project.properties b/doc/project.properties deleted file mode 100644 index cbdd341a44..0000000000 --- a/doc/project.properties +++ /dev/null @@ -1,18 +0,0 @@ -# sdocbook -maven.sdocbook.src.dir=${basedir}/docbook -maven.sdocbook.html.xsl=${maven.sdocbook.stylesheets.dir}/xhtml/acegi.xsl -maven.sdocbook.fo.xsl=${maven.sdocbook.stylesheets.dir}/fo/acegi.xsl -maven.sdocbook.htmlchunk.xsl=${maven.sdocbook.stylesheets.dir}/xhtml/acegi-chunk.xsl - -# statcvs, if you want a full, accurate history -# (this downloads the *entire* CVS into target/statcvs, so it can take some time) -#statcvs.history=true - -# ask statcvs to log parent directories (ie project root, as we're running from /doc) -statcvs.log.options=.. - - -####################### IMPORTANT STATCVS NOTE ####################### - -Statcvs will always use the "developer" repository if it is defined. To enable -end users to easily run the "site" goal, we do not define it in doc/project.xml diff --git a/doc/project.xml b/doc/project.xml deleted file mode 100644 index dd0e538306..0000000000 --- a/doc/project.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-doc - Acegi Security System for Spring - acegi-security-doc - - scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity - http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/doc/ - - - - - maven-plugins - maven-sdocbook-plugin - 1.4.1 - plugin - http://maven-plugins.sourceforge.net/maven-sdocbook-plugin/ - - - - - maven-license-plugin - maven-changes-plugin - maven-dashboard-plugin - maven-multiproject-plugin - - - diff --git a/doc/xdocs/building.xml b/doc/xdocs/building.xml index 9d9ffdd359..17de53b1c3 100644 --- a/doc/xdocs/building.xml +++ b/doc/xdocs/building.xml @@ -1,61 +1,40 @@ -Building

This project uses Maven as project manager - and build tool. We recommend you to install Maven 1.0.2 or greater before trying + + Building + +

+ + + +

This project uses Maven as project manager + and build tool. We recommend you to install Maven 2.0.5 or greater before trying the following. Note there are workarounds at the bottom of this page.

To checkout Acegi Security from SVN, see our - CVS Usage page.

Often people reading this document just want to see if Acegi Security will work + CVS Usage page.

+ + + +

Often people reading this document just want to see if Acegi Security will work for their projects. They want to deploy a sample application, and that's about it (after all, all the reference documentation can be read online at http://acegisecurity.org). - In this case, execute:

    + In this case, execute:

    + 
      cd $ACEGI_SECURITY/core (or cd %ACEGI_SECURITY%/core on Windows)
      - 
      maven jar:install
      + 
      mvn install
      cd $ACEGI_SECURITY/samples/contacts
      - 
      maven multiwar:multiwar
      - 
      copy $ACEGI_SECURITY/samples/contacts/target/acegi-security-sample-contacts-filter.war $YOUR_CONTAINER/webapps
      -

    Then load up your web container and visit - http://localhost:8080/acegi-security-sample-contacts-filter/ - (or whatever location is appropriate for your web container).

    To properly integrate Commons Attributes with Maven (as required by - the Attributes Sample), - you need to install an additional plugin.

    To install the commons-attributes-plugin, execute the following commands:

      - 
      cd $ACEGI_SECURITY/doc
      - 
      maven plugin:download
-    -DgroupId=commons-attributes
-    -DartifactId=commons-attributes-plugin
-    -Dversion=2.1
      -

    The second (final) command should be executed on a single line.

    Sometimes people are already using Acegi Security, and they just want to build the - latest code from CVS. To build all artifacts (JARs) and install them into - your local Maven repository, simply perform a CVS checkout and install the - commons-attributes-plugin (as detailed above), and then - execute:

      - 
      cd $ACEGI_SECURITY/doc
      - 
      maven multiproject:install
      -

    You can then check your $HOME/.maven/repository/acegisecurity - directory and it should contain all of the latest Acegi Security JARs.

    By "site" we mean the web site you can browse at - http://acegisecurity.sourceforge.net, - which includes the reference documentation and all of the Maven reports. - If you'd like a local copy, simply execute: -

      - 
      cd $ACEGI_SECURITY/doc
      - 
      maven -Dpassword= changelog:create-cvspass
      - 
      maven    multiproject:clean multiproject:site
-	-Dmaven.jar.override=on 
-	-Dmaven.jar.clover-ant=1.3.3_01 
-
      -
    -

    As per the - Maven Changelog Plugin Documentation, - you must tell the plugin the "anonymous CVS pserver" password is blank. This is - why there is the "create-cvspass" command shown above. You should only need to - do this once.

    If you get an OutOfMemoryError, simply execute the following before - calling Maven:

      - 
      set MAVEN_OPTS=-Xmx1024m -XX:MaxPermSize=512m
      -

    If you get an [ERROR] Invalid license: Invalid license file [E1202], - this is because the maven-clover-plugin is using an old version of - clover-ant-xxx.jar. Whilst Acegi Security's project.properties - specifies a newer version, subprojects have an inheritence problem and don't pick - this up (as of the time of writing). To workaround this issue, you need to - specify those override properties on the command line. For example, to execute the - Clover reports for the core subproject, you would do the following:

      - 
      cd $ACEGI_SECURITY/core
      - 
      maven clover:html-report -Dmaven.jar.override=on -Dmaven.jar.clover-ant=1.3.3_01
      -
\ No newline at end of file + 
mvn package
+ 
mvn jetty:run
+ + +

This should build main framework library, build the sample application and run the "contacts" sample application + using the maven jetty plugin. You should then be able to point your browser at + http://localhost:8080/contacts/ to use the application. +

+ + + +
+ + + + \ No newline at end of file diff --git a/doc/xdocs/policies.xml b/doc/xdocs/policies.xml index 69f9b4f82b..1a07a33976 100644 --- a/doc/xdocs/policies.xml +++ b/doc/xdocs/policies.xml @@ -19,7 +19,7 @@
  • - Please make your commit comments informative, yet not too detailed. Detailed comments are ideally placed in the JIRA task. In the case of a contribution by a non-developer, please use the SVN commits to reflect who provided the contribution and add that person's name to /project.xml in the contributors section. If the contributors section does not list the name of someone who has contributed accepted code, please add them or let me know so that I can do so.



    + Please make your commit comments informative, yet not too detailed. Detailed comments are ideally placed in the JIRA task. In the case of a contribution by a non-developer, please use the SVN commits to reflect who provided the contribution and add that person's name to /pom.xml in the contributors section. If the contributors section does not list the name of someone who has contributed accepted code, please add them or let me know so that I can do so.



  • @@ -27,7 +27,7 @@
  • - Please make sure /docs/xdocs/changes.xml has a reference to JIRA for the upcoming release version. You don't need to add the name of contributors to /doc/xdocs/changes.xml, as acknowledgement is already provided via /project.xml, source code @author tags, the SVN commit message, and typically a JIRA task.



    + Please make sure /docs/xdocs/changes.xml has a reference to JIRA for the upcoming release version. You don't need to add the name of contributors to /doc/xdocs/changes.xml, as acknowledgement is already provided via /pom.xml, source code @author tags, the SVN commit message, and typically a JIRA task.



  • @@ -47,7 +47,7 @@
  • - Never check in code if the unit tests fail. This means, at minimum, successfully running "maven test:test" from /core. Always name your unit test classes so they end in "*Tests" - this ensures that Maven picks them up. If there is code in SVN which you didn't write and it is breaking the unit tests, please correct it yourself - don't leave SVN "broken" whilst waiting for the responsible developer to address it (the delay causes confusing and long-running threads on the list and forum). You can always rollback to the previous working version if in doubt of how the class works (just remember to comment the commit appropriately and let the author know).



    + Never check in code if the unit tests fail. This means, at minimum, successfully running "mvn test" from /core. Always name your unit test classes so they end in "*Tests" - this ensures that Maven picks them up. If there is code in SVN which you didn't write and it is breaking the unit tests, please correct it yourself - don't leave SVN "broken" whilst waiting for the responsible developer to address it (the delay causes confusing and long-running threads on the list and forum). You can always rollback to the previous working version if in doubt of how the class works (just remember to comment the commit appropriately and let the author know).



  • diff --git a/maven.xml b/maven.xml deleted file mode 100755 index 53e0caac24..0000000000 --- a/maven.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - ${basedir} - - - - - - ${rootdir}/.. - - - - ${rootdirname} - Using root dir: ${rootdir} - - - - - - - - - - - - - diff --git a/project.properties b/project.properties deleted file mode 100644 index dd7a551e0a..0000000000 --- a/project.properties +++ /dev/null @@ -1,86 +0,0 @@ -# $Id$ - -# Values in this file will be overriden by any values with the same name -# in the user-created build.properties file. - -# Compile settings -maven.compile.debug=on -maven.compile.target=1.3 -maven.compile.source=1.3 - -# Add this to a build.properties file -#maven.username=your_sourceforge_username - -# If you'd like to have generated JARs signed, add these to build.properties -#signature.alias= -#signature.storepass= -#signature.keystore= - -maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/,http://www.springframework.org/docs/api/,http://jakarta.apache.org/commons/lang/api/,http://developer.ja-sig.org/projects/cas/multiproject/cas-server/apidocs/,http://jakarta.apache.org/commons/codec/apidocs/,http://jakarta.apache.org/commons/collections/api/,http://jakarta.apache.org/commons/logging/apidocs/,http://tomcat.apache.org/tomcat-5.0-doc/servletapi/ - -maven.repo.remote=http://repo1.maven.org/maven,http://www.ibiblio.org/maven,http://acegisecurity.sourceforge.net/maven,http://people.apache.org/repository/ - -# Site generation properties -maven.xdoc.date = left -maven.xdoc.version = ${pom.currentVersion} -maven.xdoc.distributionUrl=http://sourceforge.net/project/showfiles.php?group_id=104215 -#maven.xdoc.distributionUrl=http://acegisecurity.sourceforge.net/maven/acegisecurity/jars -maven.html2xdoc.enabled=true - -# Deploying site -maven.remote.group=acegisecurity -maven.site.deploy.method=ssh - -# Repository to deploy to -maven.repo.list=acegi - -maven.repo.acegi=sftp://shell.sourceforge.net -maven.repo.acegi.directory=/home/groups/a/ac/acegisecurity/htdocs/maven -maven.repo.acegi.group=acegisecurity - -# These must be set elsewhere -# Useful background: http://jira.codehaus.org/secure/attachment/13459/site-deployment.xml -# List of applicable properties: http://maven.apache.org/reference/plugins/artifact/properties.html -#maven.repo.acegi.username= -#maven.repo.acegi.privatekey= -#maven.repo.acegi.passphrase= -#maven.ssh.executable= -#maven.scp.executable= - -# clover-ant.jar overriding as maven-clover-plugin-1.6 uses clover-ant-1.3_01 -# which gives an "Invalid license: Invalid license file [E1202]" -maven.jar.override=on -#maven.jar.clover-ant=1.3.3_01 -maven.clover.excludes=**/*Exception.java -maven.clover.context.statement.names=nolog -maven.clover.context.statement.regexps=^if \(logger.*\).*} - -# Clover open source license for Acegi Security (kindly provided by Cenqua) -maven.clover.license.path=${rootdir}/lib/clover/clover.license - -# License plugin settings -maven.license.licenseFile=${rootdir}/LICENSE.txt - -# multiproject -maven.multiproject.basedir=${rootdir} -maven.multiproject.includes=core/project.xml,adapters/*/project.xml,samples/*/project.xml,core-tiger/project.xml - -# excluding the attributes project since the Commons Attributes plugin causes -# problems with java 5 source code compilation -maven.multiproject.excludes=samples/attributes/project.xml - -# multichanges -maven.multichanges.basedir=${maven.multiproject.basedir} -maven.multichanges.includes=${maven.multiproject.includes} - -# dashboard -maven.dashboard.basedir=${maven.multiproject.basedir} -maven.dashboard.includes=${maven.multiproject.includes} -maven.dashboard.aggregators = cserrors,cswarnings,clovertpc,cloverloc,cloverncloc,junittests,junitfailures,juniterrors,junitpassrate,simiantdl -maven.dashboard.rungoals=false -maven.dashboard.runreactor=false -maven.multiproject.site.goals=site,dashboard:report-single -# needed to get clover reports running dashboard-single -maven.clover.report.xml=true - -maven.junit.fork=true diff --git a/project.xml b/project.xml deleted file mode 100644 index 6b6ce29530..0000000000 --- a/project.xml +++ /dev/null @@ -1,571 +0,0 @@ - - - - 3 - org.acegisecurity - 1.0.4 - org.acegisecurity - Acegi Security System for Spring - Acegi Security System for Spring - - Acegi Technology Pty Limited - http://sourceforge.net/projects/acegisecurity - http://sourceforge.net/sflogo.php?group_id=104215&type=5 - - 2004 - http://acegisecurity.org/logo.gif - http://acegisecurity.org/ - 63.246.29.165 - /home/acegi/acegisecurity.org/www/apache/htdocs - shell.sf.net - /home/groups/a/ac/acegisecurity/htdocs/maven - - 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/ - - - - Acegi Developer List - https://lists.sourceforge.net/lists/listinfo/acegisecurity-developer - http://sourceforge.net/mailarchive/forum.php?forum_id=40659 - - - Acegi Developer List (at GMane) - http://news.gmane.org/gmane.comp.java.springframework.acegisecurity.devel/ - - - Acegi Developer List (at mail-archive.com) - http://www.mail-archive.com/acegisecurity-developer@lists.sourceforge.net/ - - - Spring User List - http://sourceforge.net/mailarchive/forum.php?forum_id=30287 - - - - - Ben Alex - benalex - benalex at users.sourceforge.net - Acegi Technology Pty Limited (http://www.acegi.com.au) - +10 - - - Colin Sampaleanu - colins - colinml1 at exis.com - - - Carlos Sanchez - carlossg - carlossg at users.sourceforge.net - +1 - - - Francois Beausoleil - fbos - fbos at users.sourceforge.net - - - Luke Taylor - luke_t - luke at monkeymachine.ltd.uk - Monkey Machine Ltd. (http://monkeymachine.ltd.uk) - 0 - - - Ray Krueger - raykrueger - raykrueger at users.sourceforge.net - - - Robert Sanders - robertsanders - robertsanders at users.sourceforge.net - - - Mark St.Godard - markstg - markstg at users.sourceforge.net - - - Scott McCrory - smccrory - smccrory at users.sourceforge.net - -5 - - - Vishal Puri - vishalpuri - vishalpuri at users.sourceforge.net - Interface21 Pty Limited (http://www.interface21.com) - +10 - - - - - Alan Stewart - - - Alef Arendsen - - - Cameron Braid - - - Patrick Burleson - - - Wesley Hall - - - Scott Evans - - - Andrey Grebnev - - - Travis Gregg - - - Seth Ladd - - - Karel Miarka - - - James Monaghan - - - Andrew Petro - - - Aaron Tang - - - Orlando Garcia Carmona - - - Joni Suominen - - - Sergio Berna - - - Paulo Neves - - - Mike Perham - - - Eric Crampton - - - Paul Garvey - - - - - net.sf.ehcache - ehcache - 1.2.4 - jar - http://ehcache.sourceforge.net - - true - - - - aopalliance - aopalliance - 1.0 - jar - http://aopalliance.sourceforge.net - - true - - - - commons-lang - commons-lang - 2.1 - jar - http://jakarta.apache.org/commons - - true - - - - commons-codec - commons-codec - 1.3 - jar - http://jakarta.apache.org/commons - - true - - - - commons-collections - commons-collections - 3.1 - jar - http://jakarta.apache.org/commons - - true - - - - commons-logging - commons-logging - 1.0.4 - jar - http://jakarta.apache.org/commons - - true - - - - javax.servlet - jstl - 1.0.6 - jar - - true - - - - javax.servlet - servlet-api - 2.4 - http://java.sun.com/products/servlet - - - oro - oro - 2.0.8 - jar - http://jakarta.apache.org/oro/ - - true - - - - hsqldb - hsqldb - 1.8.0.4 - jar - http://hsqldb.sourceforge.net/ - - true - - - - junit - junit - 3.8.1 - jar - - - org.springframework - spring - 1.2.9 - jar - http://www.springframework.org - - true - - - - org.springframework - spring-mock - 1.2.9 - jar - http://www.springframework.org - - - commons-attributes - commons-attributes-api - 2.1 - jar - http://jakarta.apache.org/commons - - true - - - - commons-attributes - commons-attributes-compiler - 2.1 - jar - http://jakarta.apache.org/commons - - - taglibs - standard - 1.0.6 - jar - http://jakarta.apache.org/taglibs/ - - true - - - - cas - casclient - 2.0.11 - jar - http://www.yale.edu/tp/cas - - true - - - - org.samba.jcifs - jcifs - 1.2.6 - jar - http://jcifs.samba.org/ - - - aspectj - aspectjrt - 1.2 - jar - http://www.eclipse.org/aspectj - - true - - - - javax.servlet - jsp-api - 2.0 - http://java.sun.com/products/jsp - - false - - - - - - org.apache.directory.server - apacheds-core - 1.0.0 - - test - - - - org.apache.directory.server - apacheds-core-shared - 1.0.0 - - test - - - - org.apache.directory.shared - shared-asn1 - 0.9.5.3 - - - org.apache.directory.shared - shared-ldap - 0.9.5.3 - - - antlr - antlr - 2.7.2 - jar - - - jdbm - jdbm - 1.0 - jar - - - regexp - regexp - 1.2 - jar - - - org.slf4j - slf4j-log4j12 - 1.0-rc5 - jar - - - - - - log4j - log4j - 1.2.9 - jar - - true - - - - - jmock - jmock - 1.0.1 - jar - - - - - - maven-plugins - maven-findbugs-plugin - 0.9.2 - plugin - - - - - ${basedir}/src/main/java - ${basedir}/src/test/java - - - **/*Tests.java - - - - ${basedir}/src/test/resources - - **/** - - false - - - - - - ${rootdir} - META-INF - - notice.txt - - false - - - ${basedir}/src/main/resources - - **/** - - false - - - - - - - maven-clover-plugin - maven-javadoc-plugin - maven-jdepend-plugin - maven-junit-report-plugin - maven-jxr-plugin - maven-pmd-plugin - maven-simian-plugin - maven-tasklist-plugin - maven-findbugs-plugin - - - - 0.3 - 0.3 - release_0_3 - - - 0.4 - 0.4 - release_0_4 - - - 0.5 - 0.5 - release_0_5 - - - 0.5.1 - 0.5.1 - release_0_51 - - - 0.6 - 0.6 - release_0_6 - - - 0.6.1 - 0.6.1 - release_0_6_1 - - - 0.7.0 - 0.7.0 - release_0_7_0 - - - 0.7.1 - 0.7.1 - release_0_7_1 - - - 0.8.0 - 0.8.0 - release_0_8_0 - - - 0.8.1 - 0.8.1 - release_0_8_1 - - - 0.8.1.1 - 0.8.1.1 - release_0_8_1_1 - - - 0.8.2 - 0.8.2 - release_0_8_2 - - - 0.8.3 - 0.8.3 - release_0_8_3 - - - - diff --git a/samples/annotations/maven.xml b/samples/annotations/maven.xml deleted file mode 100644 index 4ca6064af1..0000000000 --- a/samples/annotations/maven.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/samples/annotations/project.properties b/samples/annotations/project.properties deleted file mode 100644 index cfae2ce8ea..0000000000 --- a/samples/annotations/project.properties +++ /dev/null @@ -1,9 +0,0 @@ -# $Id$ - -# Compile settings -# -# Java 1.5 is required due to the use of annotations for metadata. -# (main Acegi Security project / parent) is Java 1.3 compatible -# -maven.compile.target=1.5 -maven.compile.source=1.5 \ No newline at end of file diff --git a/samples/annotations/project.xml b/samples/annotations/project.xml deleted file mode 100644 index 665cb4e6a8..0000000000 --- a/samples/annotations/project.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-sample-annotations - Acegi Security System for Spring - Annotations sample - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-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/ - - - - org.acegisecurity - acegi-security-tiger - 1.0.4 - jar - - - - diff --git a/samples/attributes/maven.xml b/samples/attributes/maven.xml deleted file mode 100644 index 7e6e07fbce..0000000000 --- a/samples/attributes/maven.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/samples/attributes/project.properties b/samples/attributes/project.properties deleted file mode 100644 index c5c2347601..0000000000 --- a/samples/attributes/project.properties +++ /dev/null @@ -1,10 +0,0 @@ -# $Id$ - -###################################################################### -# Commons-Attributes -###################################################################### -org.apache.commons.attributes.enable=true -org.apache.commons.attributes.index.enable=true - -# Having difficulty? Try executing "maven install-plugin" from the -# attributes directory. See the maven.xml for what this goal does. diff --git a/samples/attributes/project.xml b/samples/attributes/project.xml deleted file mode 100644 index 73c3b911c8..0000000000 --- a/samples/attributes/project.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-sample-attributes - Acegi Security System for Spring - Attributes sample - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-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/ - - - - 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/contacts/maven.xml b/samples/contacts/maven.xml deleted file mode 100644 index 91fb28d1cb..0000000000 --- a/samples/contacts/maven.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - The "war" goal is deprecated. Use "multiwar:multiwar" instead. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - multiproject:install doesn't install Contacts Samples WARs to local repo - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/contacts/project.properties b/samples/contacts/project.properties deleted file mode 100644 index e79320ca7e..0000000000 --- a/samples/contacts/project.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Ant properties for building the Contacts sample application. -# $Id$ - -name.filter=contacts -name.ca=contacts-container-adapter -name.cas=contacts-cas -src.dir=src -war.dir=war -lib.dir=${basedir}/../../lib -dist.lib.dir=${basedir}/../../dist -build.dir=classes -dist.dir=dist -javadocs.dir=api -jalopy.xml=${basedir}/../../jalopy.xml -tmp.dir=temporary -etc.dir=etc -client.dir=client - - -maven.war.src=${maven.src.dir}/main/webapp/common - -maven.multiproject.type=multiwar - -maven.xdoc.distributionType=war -maven.xdoc.distributionUrl=http://acegisecurity.sourceforge.net/maven/acegisecurity/wars diff --git a/samples/contacts/project.xml b/samples/contacts/project.xml deleted file mode 100644 index 4acd7ada21..0000000000 --- a/samples/contacts/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-sample-contacts - Acegi Security System for Spring - Contacts sample - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-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/ - - - - hessian - hessian - 3.0.1 - jar - http://www.caucho.com - - true - - - - burlap - burlap - 2.1.7 - jar - http://www.caucho.com - - true - - - - - diff --git a/samples/project.xml b/samples/project.xml deleted file mode 100644 index 9b357b9512..0000000000 --- a/samples/project.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - ${basedir}/../project.xml - 3 - - 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/ - - - - org.acegisecurity - acegi-security - 1.0.4 - jar - http://acegisecurity.org - - true - - - - - - diff --git a/samples/tutorial/project.properties b/samples/tutorial/project.properties deleted file mode 100644 index 8f29f6e54f..0000000000 --- a/samples/tutorial/project.properties +++ /dev/null @@ -1,3 +0,0 @@ -maven.multiproject.type=war -# Change default property value -maven.src.dir=src/main diff --git a/samples/tutorial/project.xml b/samples/tutorial/project.xml deleted file mode 100644 index ab21b68235..0000000000 --- a/samples/tutorial/project.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - ${basedir}/../project.xml - 3 - acegi-security-sample-tutorial - Acegi Security System for Spring - Tutorial sample - /home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-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/ - - diff --git a/src/site/resources/policies.html b/src/site/resources/policies.html index ecd59067f7..5716b68bf8 100644 --- a/src/site/resources/policies.html +++ b/src/site/resources/policies.html @@ -48,7 +48,7 @@
  • - Please make your commit comments informative, yet not too detailed. Detailed comments are ideally placed in the JIRA task. In the case of a contribution by a non-developer, please use the SVN commits to reflect who provided the contribution and add that person's name to /project.xml in the contributors section. If the contributors section does not list the name of someone who has contributed accepted code, please add them or let me know so that I can do so.

    + Please make your commit comments informative, yet not too detailed. Detailed comments are ideally placed in the JIRA task. In the case of a contribution by a non-developer, please use the SVN commits to reflect who provided the contribution and add that person's name to /pom.xml in the contributors section. If the contributors section does not list the name of someone who has contributed accepted code, please add them or let me know so that I can do so.

  • @@ -56,7 +56,7 @@
  • - Please make sure /docs/xdocs/changes.xml has a reference to JIRA for the upcoming release version. You don't need to add the name of contributors to /doc/xdocs/changes.xml, as acknowledgement is already provided via /project.xml, source code @author tags, the SVN commit message, and typically a JIRA task.

    + Please make sure /docs/xdocs/changes.xml has a reference to JIRA for the upcoming release version. You don't need to add the name of contributors to /doc/xdocs/changes.xml, as acknowledgement is already provided via /pom.xml, source code @author tags, the SVN commit message, and typically a JIRA task.