squirrel-sql-commits

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/mavenize
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3187

Modified Files:
	mavenize.pl 
Log Message:
Copy fw resource files under resources.  Install custom pom for laf plugin.

Index: mavenize.pl
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mavenize.pl	8 Aug 2009 16:48:45 -0000	1.1
--- mavenize.pl	15 Aug 2009 17:37:50 -0000	1.2
***************
*** 23,26 ****
--- 23,27 ----
  $topDir = "/home/manningr/projects/squirrel_maven2/sql12";
  $pluginsDir = $topDir . "/plugins";
+ $lafPluginDir = $pluginsDir . "/laf";
  
  # copy in the root pom - this pom builds all of SQuirreL
***************
*** 52,55 ****
--- 53,60 ----
  `find . -type f -name *.png -print | grep -v main | xargs -i cp {} main/resources/{}`;
  
+ `find $fwDir/src/main/java -name *.properties | xargs -i rm {}`;
+ `find $fwDir/src/main/java -name "*.gif" | xargs -i rm {}`;
+ `find $fwDir/src/main/java -name "*.png" | xargs -i rm {}`;
+ 
  chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n";
  
***************
*** 72,78 ****
--- 77,90 ----
  `find . -name "*.xml" -printf "%h\n" | grep -v "^./main" | xargs -i mkdir -p main/resources/{}`;
  `find . -type f -name "*.xml" -print | grep -v "^./main" | xargs -i cp {} main/resources/{}`;
+ `find . -name "*.jpg" -printf "%h\n" | grep -v "^./main" | xargs -i mkdir -p main/resources/{}`;
+ `find . -type f -name "*.jpg" -print | grep -v "^./main" | xargs -i cp {} main/resources/{}`;
+ 
  
  `find $appDir/src/main/java -name *.properties | xargs -i rm {}`;
+ `find $appDir/src/main/java -name "*.gif" | xargs -i rm {}`;
+ `find $appDir/src/main/java -name "*.png" | xargs -i rm {}`;
  `find $appDir/src/main/java -name "*.xml" | xargs -i rm {}`;
+ `find $appDir/src/main/java -name "*.jpg" | xargs -i rm {}`;
+ 
  
  chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n";
***************
*** 108,121 ****
  EOF
  
- $laf_deps = <<"EOF";
- <dependencies>
-    	<dependency>
-    		<groupId>com.jgoodies</groupId>
-    		<artifactId>looks</artifactId>
-    		<version>2.2.1</version>
-    	</dependency>
-    </dependencies>
- EOF
- 
  $oracle_deps = <<"EOF";
  <dependencies>
--- 120,123 ----
***************
*** 226,229 ****
--- 228,238 ----
  find( { wanted => \&wanted_for_testsources, no_chdir => 0 }, $topDir . "/test/src");
  
+ # Miscellaneous
+ print "Installing L&F Plugin Assembly ($mavenizeDir/laf-plugin/laf-plugin-assembly.xml) in $lafPluginDir/src/main/resources/assemblies\n";
+ `mkdir -p $lafPluginDir/src/main/resources/assemblies`;
+ `cp $mavenizeDir/laf-plugin/laf-plugin-assembly.xml $lafPluginDir/src/main/resources/assemblies`;
+ 
+ # End of script; Begin Subroutines
+ 
  sub wanted_for_poms {
  
***************
*** 249,253 ****
   		$dependencies = $isqlj_deps;
  	} elsif ($artifactId =~ 'laf') {
! 		$dependencies = $laf_deps;
  	} elsif ($artifactId =~ 'oracle') {
  		$dependencies = $oracle_deps;
--- 258,264 ----
   		$dependencies = $isqlj_deps;
  	} elsif ($artifactId =~ 'laf') {
! 		# laf plugin assembly is a radical departure from other plugins, so it has it's own custom pom now.
! 		`cp $mavenizeDir/laf-plugin/pom.xml $newPomFile`;
! 		return;		
  	} elsif ($artifactId =~ 'oracle') {
  		$dependencies = $oracle_deps;
***************
*** 440,443 ****
--- 451,455 ----
  }
  
+ # Converts the package argument into a directory string
  sub convertPackageToDirectory {
  	$package = shift;