svnno****@sourc*****
svnno****@sourc*****
2009年 1月 31日 (土) 00:30:42 JST
Revision: 2580 http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2580 Author: daisuke_m Date: 2009-01-31 00:30:42 +0900 (Sat, 31 Jan 2009) Log Message: ----------- [GEN-71] 依存関係修正など。 Modified Paths: -------------- artemis/trunk/factory-enhancer/.project artemis/trunk/generic-tree/.project artemis/trunk/jiemamy-artemis/.classpath artemis/trunk/jiemamy-artemis/pom.xml artemis/trunk/jiemamy-artemis-test/.classpath artemis/trunk/jiemamy-artemis-test/pom.xml artemis/trunk/jiemamy-composer/.classpath artemis/trunk/jiemamy-core/.classpath artemis/trunk/jiemamy-dialect-mysql/.classpath artemis/trunk/jiemamy-dialect-postgresql/.classpath artemis/trunk/jiemamy-dialect-sql99/.classpath artemis/trunk/jiemamy-event/.classpath artemis/trunk/jiemamy-view/.classpath vesta/trunk/jiemamy-vesta/.classpath vesta/trunk/jiemamy-vesta/mvn_install.bat vesta/trunk/org.jiemamy.eclipse/.classpath vesta/trunk/org.jiemamy.eclipse/.project vesta/trunk/org.jiemamy.eclipse/pom.xml -------------- next part -------------- Modified: artemis/trunk/factory-enhancer/.project =================================================================== --- artemis/trunk/factory-enhancer/.project 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/factory-enhancer/.project 2009-01-30 15:30:42 UTC (rev 2580) @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>factory-enhancer</name> - <comment/> - <projects/> + <comment></comment> + <projects> + </projects> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> </buildCommand> <buildCommand> <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name> Modified: artemis/trunk/generic-tree/.project =================================================================== --- artemis/trunk/generic-tree/.project 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/generic-tree/.project 2009-01-30 15:30:42 UTC (rev 2580) @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>generic-tree</name> - <comment/> - <projects/> + <comment></comment> + <projects> + </projects> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> </buildCommand> <buildCommand> <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name> Modified: artemis/trunk/jiemamy-artemis/.classpath =================================================================== --- artemis/trunk/jiemamy-artemis/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-artemis/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: artemis/trunk/jiemamy-artemis/pom.xml =================================================================== --- artemis/trunk/jiemamy-artemis/pom.xml 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-artemis/pom.xml 2009-01-30 15:30:42 UTC (rev 2580) @@ -75,16 +75,16 @@ <modules> <module>../factory-enhancer</module> <module>../generic-tree</module> - <module>../org.jiemamy.core</module> - <module>../org.jiemamy.composer</module> - <module>../org.jiemamy.dialect.sql99</module> - <module>../org.jiemamy.dialect.postgresql</module> - <module>../org.jiemamy.dialect.mysql</module> - <module>../org.jiemamy.event</module> - <module>../org.jiemamy.view</module> + <module>../jiemamy-core</module> + <module>../jiemamy-composer</module> + <module>../jiemamy-dialect-sql99</module> + <module>../jiemamy-dialect-postgresql</module> + <module>../jiemamy-dialect-mysql</module> + <module>../jiemamy-event</module> + <module>../jiemamy-view</module> <module>../jiemamy-artemis-test</module> <!-- - <module>../org.jiemamy.diff</module> + <module>../jiemamy-diff</module> --> </modules> <build> Modified: artemis/trunk/jiemamy-artemis-test/.classpath =================================================================== --- artemis/trunk/jiemamy-artemis-test/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-artemis-test/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -2,23 +2,8 @@ <classpath> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="lib" path="lib/junit-4.5.jar" sourcepath="lib/sources/junit-4.5-sources.jar"/> - <classpathentry kind="lib" path="lib/jmockit-0.94.jar"/> - <classpathentry kind="lib" path="lib/hamcrest-core-1.1.jar" sourcepath="lib/sources/hamcrest-core-1.1-sources.jar"/> - <classpathentry kind="lib" path="lib/hamcrest-library-1.1.jar" sourcepath="lib/sources/hamcrest-library-1.1-sources.jar"/> + <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.spec.core"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.spec.diff"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.spec.event"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.spec.view"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.core"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.composer"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.dialect.mysql"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.dialect.postgresql"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.dialect.sql99"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.event"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.view"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> - <classpathentry combineaccessrules="false" kind="src" path="/factory-enhancer"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: artemis/trunk/jiemamy-artemis-test/pom.xml =================================================================== --- artemis/trunk/jiemamy-artemis-test/pom.xml 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-artemis-test/pom.xml 2009-01-30 15:30:42 UTC (rev 2580) @@ -106,4 +106,4 @@ <url>scp://report.jiemamy.org/var/www/report/jiemamy-artemis-test</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> Modified: artemis/trunk/jiemamy-composer/.classpath =================================================================== --- artemis/trunk/jiemamy-composer/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-composer/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -6,6 +6,6 @@ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: artemis/trunk/jiemamy-core/.classpath =================================================================== --- artemis/trunk/jiemamy-core/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-core/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -6,6 +6,6 @@ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: artemis/trunk/jiemamy-dialect-mysql/.classpath =================================================================== --- artemis/trunk/jiemamy-dialect-mysql/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-dialect-mysql/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -6,6 +6,6 @@ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: artemis/trunk/jiemamy-dialect-postgresql/.classpath =================================================================== --- artemis/trunk/jiemamy-dialect-postgresql/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-dialect-postgresql/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -6,6 +6,6 @@ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: artemis/trunk/jiemamy-dialect-sql99/.classpath =================================================================== --- artemis/trunk/jiemamy-dialect-sql99/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-dialect-sql99/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -6,6 +6,6 @@ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: artemis/trunk/jiemamy-event/.classpath =================================================================== --- artemis/trunk/jiemamy-event/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-event/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -6,6 +6,6 @@ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: artemis/trunk/jiemamy-view/.classpath =================================================================== --- artemis/trunk/jiemamy-view/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ artemis/trunk/jiemamy-view/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -6,6 +6,6 @@ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: vesta/trunk/jiemamy-vesta/.classpath =================================================================== --- vesta/trunk/jiemamy-vesta/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ vesta/trunk/jiemamy-vesta/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: vesta/trunk/jiemamy-vesta/mvn_install.bat =================================================================== --- vesta/trunk/jiemamy-vesta/mvn_install.bat 2009-01-30 15:12:27 UTC (rev 2579) +++ vesta/trunk/jiemamy-vesta/mvn_install.bat 2009-01-30 15:30:42 UTC (rev 2580) @@ -21,6 +21,6 @@ :RUN_MAVEN REM ==== build jiemamy -call mvn clean install +call mvn clean package pause Modified: vesta/trunk/org.jiemamy.eclipse/.classpath =================================================================== --- vesta/trunk/org.jiemamy.eclipse/.classpath 2009-01-30 15:12:27 UTC (rev 2579) +++ vesta/trunk/org.jiemamy.eclipse/.classpath 2009-01-30 15:30:42 UTC (rev 2580) @@ -4,35 +4,8 @@ <classpathentry kind="src" path="src/main/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="lib" path="lib/junit-4.5.jar" sourcepath="lib/sources/junit-4.5-sources.jar"/> - <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.5.5.jar"/> - <classpathentry exported="true" kind="lib" path="lib/logback-classic-0.9.9.jar"/> - <classpathentry exported="true" kind="lib" path="lib/logback-core-0.9.9.jar"/> - <classpathentry exported="true" kind="lib" path="lib/eclipse-common-0.0.4.jar"/> - <classpathentry kind="lib" path="lib/hamcrest-core-1.1.jar" sourcepath="lib/sources/hamcrest-core-1.1-sources.jar"/> - <classpathentry kind="lib" path="lib/hamcrest-library-1.1.jar" sourcepath="lib/sources/hamcrest-library-1.1-sources.jar"/> - <classpathentry kind="lib" path="lib/collections-generic-4.01.jar"/> - <classpathentry kind="lib" path="lib/commons-beanutils-1.8.0.jar"/> - <classpathentry kind="lib" path="lib/commons-io-1.3.2.jar"/> - <classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/> - <classpathentry kind="lib" path="lib/factory-enhancer-0.1.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/generic-tree-0.1.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/javassist-3.8.0.GA.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.core-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.event-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.spec.core-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.spec.event-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.spec.view-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.view-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/slf4j-api-1.5.5.jar"/> - <classpathentry kind="lib" path="lib/stax-1.2.0.jar"/> - <classpathentry kind="lib" path="lib/stax-api-1.0.1.jar"/> - <classpathentry kind="lib" path="lib/wstx-asl-3.2.7.jar"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/> - <classpathentry kind="lib" path="lib/org.jiemamy.dialect.mysql-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.dialect.postgresql-0.2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/org.jiemamy.dialect.sql99-0.2.0-SNAPSHOT.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jiemamy-irenka"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: vesta/trunk/org.jiemamy.eclipse/.project =================================================================== --- vesta/trunk/org.jiemamy.eclipse/.project 2009-01-30 15:12:27 UTC (rev 2579) +++ vesta/trunk/org.jiemamy.eclipse/.project 2009-01-30 15:30:42 UTC (rev 2580) @@ -30,12 +30,18 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>edu.umd.cs.findbugs.ZZZZZZplugin.eclipse.findbugsNature</nature> + <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> - <nature>edu.umd.cs.findbugs.ZZZZZZplugin.eclipse.findbugsNature</nature> - <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> <linkedResources> <link> Modified: vesta/trunk/org.jiemamy.eclipse/pom.xml =================================================================== --- vesta/trunk/org.jiemamy.eclipse/pom.xml 2009-01-30 15:12:27 UTC (rev 2579) +++ vesta/trunk/org.jiemamy.eclipse/pom.xml 2009-01-30 15:30:42 UTC (rev 2580) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jiemamy</groupId> - <artifactId>jiemamy-artemis</artifactId> + <artifactId>jiemamy-vesta</artifactId> <version>0.2.0-SNAPSHOT</version> <relativePath>../jiemamy-vesta</relativePath> </parent> @@ -122,53 +122,53 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.spec.core</artifactId> + <artifactId>jiemamy-spec-core</artifactId> <version>${project.version}</version> <exclusions> </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.spec.event</artifactId> + <artifactId>jiemamy-spec-event</artifactId> <version>${project.version}</version> <exclusions> </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.spec.view</artifactId> + <artifactId>jiemamy-spec-view</artifactId> <version>${project.version}</version> <exclusions> </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.core</artifactId> + <artifactId>jiemamy-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.event</artifactId> + <artifactId>jiemamy-event</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.dialect.sql99</artifactId> + <artifactId>jiemamy-dialect-sql99</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.dialect.mysql</artifactId> + <artifactId>jiemamy-dialect-mysql</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.dialect.postgresql</artifactId> + <artifactId>jiemamy-dialect-postgresql</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jiemamy.view</artifactId> + <artifactId>jiemamy-view</artifactId> <version>${project.version}</version> </dependency> <dependency>