[java-parent-projects COMMIT] /java-parent-project-v2/trunk/bin/create-project-common.sh /java-parent-project-v2/trun...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Nov  8 15:10:16 2012
New Revision: 80

URL: http://svn.shibboleth.net/view/java-parent-projects?rev=80&view=rev
Log:
Initial pass on updating parent project content and scripts for v2/v3 split.

Modified:
    java-parent-project-v2/trunk/bin/create-project-common.sh
    java-parent-project-v2/trunk/bin/lock-version-common.sh
    java-parent-project-v2/trunk/resources/eclipse/.checkstyle
    java-parent-project-v2/trunk/resources/maven/pom.xml.tmpl
    java-parent-project-v2/trunk/resources/svn/externals.svn
    java-parent-project-v3/trunk/bin/create-project-common.sh
    java-parent-project-v3/trunk/bin/lock-version-common.sh
    java-parent-project-v3/trunk/resources/eclipse/.checkstyle
    java-parent-project-v3/trunk/resources/maven/pom.xml.tmpl
    java-parent-project-v3/trunk/resources/svn/externals.svn

Modified: java-parent-project-v2/trunk/bin/create-project-common.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v2/trunk/bin/create-project-common.sh?rev=80&r1=79&r2=80&view=diff
==============================================================================
--- java-parent-project-v2/trunk/bin/create-project-common.sh (original)
+++ java-parent-project-v2/trunk/bin/create-project-common.sh Thu Nov  8 15:10:16 2012
@@ -15,7 +15,7 @@
 # URL to the java parent project from which everything inherits
 # we start with the trunk version and then use the *-lock-version commands before
 # we do a release in order to lock this project to a specific parent project version
-declare -r PARENT_PROJ_URL="https://svn.shibboleth.net/java-parent-project/trunk"
+declare -r PARENT_PROJ_URL="https://svn.shibboleth.net/java-parent-projects/java-parent-project-v2/trunk"
 
 # Checks that the given return value was 0 and, if not, prints a given error messages and exits
 #

Modified: java-parent-project-v2/trunk/bin/lock-version-common.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v2/trunk/bin/lock-version-common.sh?rev=80&r1=79&r2=80&view=diff
==============================================================================
--- java-parent-project-v2/trunk/bin/lock-version-common.sh (original)
+++ java-parent-project-v2/trunk/bin/lock-version-common.sh Thu Nov  8 15:10:16 2012
@@ -12,7 +12,7 @@
     fi
 
     echo "Setting svn:externals property on directory $2"
-    $SVN --non-interactive --quiet propset svn:externals "/java-parent-project/tags/$1/resources/eclipse/.settings .settings" "$2"
+    $SVN --non-interactive --quiet propset svn:externals "/java-parent-projects/java-parent-project-v2/tags/$1/resources/eclipse/.settings .settings" "$2"
     RETVAL=$?
     if [ $RETVAL != 0 ] ; then
         echo "Setting the svn:externals property on directory $2 failed with a status code of $RETVAL"
@@ -45,11 +45,11 @@
     fi
 
     echo "Setting the version of the checkstyle configuration located in $2/.checkstyle"
-    $SED "s/project\/trunk\/resources/project\/tags\/$1\/resources/1" "$2/.checkstyle" > "$2/.checkstyle.tmp"
+    $SED "s/java-parent-project-v2\/trunk\/resources/java-parent-project-v2\/tags\/$1\/resources/1" "$2/.checkstyle" > "$2/.checkstyle.tmp"
     RETVAL=$?
     if [ $RETVAL != 0 ] ; then
         echo "Setting the version of the checkstyle configuration located in $2/.checkstyle failed with a status code of $RETVAL"
         exit 1;
     fi
     mv "$2/.checkstyle.tmp" "$2/.checkstyle"
-}
+}

Modified: java-parent-project-v2/trunk/resources/eclipse/.checkstyle
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v2/trunk/resources/eclipse/.checkstyle?rev=80&r1=79&r2=80&view=diff
==============================================================================
--- java-parent-project-v2/trunk/resources/eclipse/.checkstyle (original)
+++ java-parent-project-v2/trunk/resources/eclipse/.checkstyle Thu Nov  8 15:10:16 2012
@@ -3,7 +3,7 @@
 <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
 
     <local-check-config name="Shibboleth Checkstyle" type="remote" description=""
-                        location="https://svn.shibboleth.net/java-parent-project/trunk/resources/checkstyle/checkstyle.xml">
+                        location="https://svn.shibboleth.net/java-parent-projects/java-parent-project-v2/trunk/resources/checkstyle/checkstyle.xml">
         <additional-data name="cache-file" value="true"/>
         <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
         <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
@@ -13,4 +13,4 @@
         <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
     </fileset>
   
-</fileset-config>
+</fileset-config>

Modified: java-parent-project-v2/trunk/resources/maven/pom.xml.tmpl
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v2/trunk/resources/maven/pom.xml.tmpl?rev=80&r1=79&r2=80&view=diff
==============================================================================

[... 122 lines stripped ...]