[java-parent-projects COMMIT] in /java-parent-project-v3/trunk/bin: add-module.sh create-project-common.sh create-pro...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 13 17:43:11 2014
New Revision: 206

URL: http://svn.shibboleth.net/view/java-parent-projects?rev=206&view=rev
Log:
Create Eclipse settings in new projects/modules.

Modified:
    java-parent-project-v3/trunk/bin/add-module.sh
    java-parent-project-v3/trunk/bin/create-project-common.sh
    java-parent-project-v3/trunk/bin/create-project-monolithic.sh

Modified: java-parent-project-v3/trunk/bin/add-module.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/add-module.sh?rev=206&r1=205&r2=206&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/add-module.sh (original)
+++ java-parent-project-v3/trunk/bin/add-module.sh Mon Jan 13 17:43:11 2014
@@ -21,6 +21,9 @@
 create_src $MODULE_DIR
 create_eclipse_files $MODULE_DIR $MVN_ARTF_ID
 
+$ECHO "Downloading Eclipse .settings files"
+create_eclipse_settings_files $MODULE_DIR
+
 $CP $PROJ_DIR/*-parent/module-pom.xml.tmpl "$MODULE_DIR/pom.xml"
 check_retval $? "Unable to copy module POM template to $MODULE_DIR"
 
@@ -33,7 +36,7 @@
 $SVN commit -q -m "Add module $MVN_ARTF_ID to project" $MODULE_DIR
 check_retval $? "Unable to commit $MODULE_DIR"
 
-$ECHO "Setting SVN externals and ignore properties on $MODULE_DIR"
+$ECHO "Setting SVN properties on $MODULE_DIR"
 set_svn_properties_commit_and_update "$MODULE_DIR"
 
 $ECHO "Creation of module $MVN_ARTF_ID completed."

Modified: java-parent-project-v3/trunk/bin/create-project-common.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/create-project-common.sh?rev=206&r1=205&r2=206&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/create-project-common.sh (original)
+++ java-parent-project-v3/trunk/bin/create-project-common.sh Mon Jan 13 17:43:11 2014
@@ -126,7 +126,6 @@
 # Download Eclipse .settings files
 #
 # $1 directory in which the Eclipse settings files will be placed
-# $2 project/artifact ID
 function download_eclipse_settings_files {
     download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.core.resources.prefs" "$1/.settings/org.eclipse.core.resources.prefs"
     download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.jdt.core.prefs" "$1/.settings/org.eclipse.jdt.core.prefs"
@@ -182,6 +181,6 @@
     check_retval $? "Unable to set svn:ignore property on $1"
     $RM "$TMPDIR/ignore.svn"
     
-    $SVN commit -q -m "Committing svn.externals and svn.ignore" "$1"
+    $SVN commit -q -m "Committing svn.ignore" "$1"
     check_retval $? "Unable to commit svn:ignore of $1."
 }

Modified: java-parent-project-v3/trunk/bin/create-project-monolithic.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/create-project-monolithic.sh?rev=206&r1=205&r2=206&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/create-project-monolithic.sh (original)
+++ java-parent-project-v3/trunk/bin/create-project-monolithic.sh Mon Jan 13 17:43:11 2014
@@ -35,13 +35,14 @@
 create_assembly $PROJ_DIR
 create_doc $PROJ_DIR
 create_eclipse_files $PROJ_DIR $MVN_ARTF_ID
+create_eclipse_settings_files $PROJ_DIR
 create_pom_file $PROJ_DIR $PARENT_PROJ_URL/resources/maven/pom.xml.tmpl $MVN_GROUP_ID $MVN_ARTF_ID 
 create_site_file $PROJ_DIR
 
 $ECHO "Importing project structure into SVN repository $SVN_PROJ_URL and checking out working copy to ./$MVN_ARTF_ID"
 import_checkout_svn_project $SVN_PROJ_DIR $SVN_PROJ_URL $MVN_ARTF_ID
 
-$ECHO "Setting SVN externals and ignore properties on ./$MVN_ARTF_ID"
+$ECHO "Setting SVN properties on ./$MVN_ARTF_ID"
 set_svn_properties_commit_and_update "$MVN_ARTF_ID"
 
 $ECHO "Creation of project $MVN_ARTF_ID completed.  Working copy is located at ./$MVN_ARTF_ID"