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

[noreply at shibboleth.net]

Author: iay
Date: Fri Jan 17 09:16:52 2014
New Revision: 211

URL: http://svn.shibboleth.net/view/java-parent-projects?rev=211&view=rev
Log:
JPAR-48: back-port no-externals script changes from V3 parent project

Modified:
    java-parent-project-v2/trunk/bin/add-module.sh
    java-parent-project-v2/trunk/bin/create-project-common.sh
    java-parent-project-v2/trunk/bin/create-project-monolithic.sh
    java-parent-project-v2/trunk/bin/create-project-multimodule.sh
    java-parent-project-v2/trunk/bin/lock-version-common.sh
    java-parent-project-v2/trunk/bin/lock-version-monolithic.sh
    java-parent-project-v2/trunk/bin/lock-version-multimodule.sh

Modified: java-parent-project-v2/trunk/bin/add-module.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v2/trunk/bin/add-module.sh?rev=211&r1=210&r2=211&view=diff
==============================================================================
--- java-parent-project-v2/trunk/bin/add-module.sh (original)
+++ java-parent-project-v2/trunk/bin/add-module.sh Fri Jan 17 09:16:52 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-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=211&r1=210&r2=211&view=diff
==============================================================================
--- java-parent-project-v2/trunk/bin/create-project-common.sh (original)
+++ java-parent-project-v2/trunk/bin/create-project-common.sh Fri Jan 17 09:16:52 2014
@@ -11,6 +11,7 @@
 declare -r RM=${RM:-"/bin/rm"}
 declare -r SVN=${SVN:-"/usr/bin/svn"}
 declare -r TOUCH=${TOUCH:-"/usr/bin/touch"}
+declare -r FIND=${FIND:-"/usr/bin/find"}
 
 # URL to the java parent project from which everything inherits
 # we start with the trunk version and then use the *-lock-version commands before
@@ -113,6 +114,41 @@
     expand_macro $1/.project "MVN_ARTF_ID" $2
 }
 
+# Creates Eclipse .settings directory
+#
+# $1 directory in which the Eclipse .settings directory will be placed
+function create_eclipse_settings_files {
+    $MKDIR $1/.settings
+	check_retval $? "Unable to create project directory $1/.settings"
+    download_eclipse_settings_files $1
+}
+
+# Download Eclipse .settings files
+#
+# $1 directory in which the Eclipse settings files will be placed
+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"
+    download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.jdt.ui.prefs" "$1/.settings/org.eclipse.jdt.ui.prefs"
+    download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.m2e.core.prefs" "$1/.settings/org.eclipse.m2e.core.prefs"
+}
+
+# Creates Eclipse defaults in multi-module parent
+#
+# $1 location of parent module for project
+function create_eclipse_defaults {
+    $MKDIR $1/resources
+	check_retval $? "Unable to create project directory $1/resources"
+    $MKDIR $1/resources/eclipse
+	check_retval $? "Unable to create project directory $1/resources/eclipse"
+    $MKDIR $1/resources/eclipse/settings
+	check_retval $? "Unable to create project directory $1/resources/eclipse/settings"
+    download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.core.resources.prefs" "$1/resources/eclipse/settings/org.eclipse.core.resources.prefs"
+    download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.jdt.core.prefs" "$1/resources/eclipse/settings/org.eclipse.jdt.core.prefs"
+    download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.jdt.ui.prefs" "$1/resources/eclipse/settings/org.eclipse.jdt.ui.prefs"
+    download_file "$PARENT_PROJ_URL/resources/eclipse/.settings/org.eclipse.m2e.core.prefs" "$1/resources/eclipse/settings/org.eclipse.m2e.core.prefs"
+}
+
 # Fetchs the template POM file and populates its macros.
 #
 # $1 directory in which the POM file will be placed
@@ -152,21 +188,15 @@
     check_retval $? "Unable to checkout $2/trunk into $3"
 }
 
-# Sets the SVN externals and ignore properties on a given directory, commits the change,
-# and performs and SVN update to pull in the externals
+# Sets the SVN ignore properties on a given directory, commits the change.
 #

[... 140 lines stripped ...]