Menu
▾
▴
openuss-svn-commits — Subversion commitments
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(57) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(86) |
Mar
(385) |
Apr
(198) |
May
(359) |
Jun
(199) |
Jul
(202) |
Aug
(667) |
Sep
(519) |
Oct
(128) |
Nov
(96) |
Dec
(65) |
| 2008 |
Jan
(145) |
Feb
(539) |
Mar
(1042) |
Apr
(48) |
May
(26) |
Jun
(11) |
Jul
(36) |
Aug
(9) |
Sep
(25) |
Oct
(46) |
Nov
(23) |
Dec
(19) |
| 2009 |
Jan
(6) |
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <id...@us...> - 2006-05-24 18:31:43
|
Revision: 50 Author: idueppe Date: 2006-05-24 11:31:34 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=50&view=rev Log Message: ----------- renamed to build.xml for easier using from shell Added Paths: ----------- trunk/openuss/tools/missing-dependencies/build.xml Removed Paths: ------------- trunk/openuss/tools/missing-dependencies/install-missing.xml Copied: trunk/openuss/tools/missing-dependencies/build.xml (from rev 49, trunk/openuss/tools/missing-dependencies/install-missing.xml) =================================================================== --- trunk/openuss/tools/missing-dependencies/build.xml (rev 0) +++ trunk/openuss/tools/missing-dependencies/build.xml 2006-05-24 18:31:34 UTC (rev 50) @@ -0,0 +1,48 @@ +<project name="install-mising-files" default="install-all" basedir="."> + <target name="install-all"> + <antcall target="jaybird"/> + <antcall target="jta"/> + <antcall target="tomahawk"/> + <antcall target="tomahawk-javadoc"/> + </target> + <target name="jaybird"> + <exec executable="mvn.bat"> + <arg value="install:install-file"/> + <arg value="-Dfile=./jaybird/jaybird-full-2.0.1.jar"/> + <arg value="-DgroupId=jaybird"/> + <arg value="-DartifactId=jaybird-full"/> + <arg value="-Dversion=2.0.1"/> + <arg value="-Dpackaging=jar"/> + </exec> + </target> + <target name="jta"> + <exec executable="mvn.bat"> + <arg value="install:install-file"/> + <arg value="-Dfile=./javax.transaction/jta-1.0.1B.jar"/> + <arg value="-DgroupId=javax.transaction"/> + <arg value="-DartifactId=jtal"/> + <arg value="-Dversion=1.0.1B"/> + <arg value="-Dpackaging=jar"/> + </exec> + </target> + <target name="tomahawk"> + <exec executable="mvn.bat"> + <arg value="install:install-file"/> + <arg value="-Dfile=./myfaces/tomahawk-1.1.2.jar"/> + <arg value="-DgroupId=org.apache.myfaces.tomahawk"/> + <arg value="-DartifactId=tomahawk"/> + <arg value="-Dversion=1.1.2"/> + <arg value="-Dpackaging=jar"/> + </exec> + </target> + <target name="tomahawk-javadoc"> + <exec executable="mvn.bat"> + <arg value="install:install-file"/> + <arg value="-Dfile=./myfaces/tomahawk-1.1.2.jar"/> + <arg value="-DgroupId=org.apache.myfaces.tomahawk"/> + <arg value="-DartifactId=tomahawk"/> + <arg value="-Dversion=1.1.2"/> + <arg value="-Dpackaging=javadoc"/> + </exec> + </target> +</project> Deleted: trunk/openuss/tools/missing-dependencies/install-missing.xml =================================================================== --- trunk/openuss/tools/missing-dependencies/install-missing.xml 2006-05-24 18:28:38 UTC (rev 49) +++ trunk/openuss/tools/missing-dependencies/install-missing.xml 2006-05-24 18:31:34 UTC (rev 50) @@ -1,48 +0,0 @@ -<project name="install-mising-files" default="install-all" basedir="."> - <target name="install-all"> - <antcall target="jaybird"/> - <antcall target="jta"/> - <antcall target="tomahawk"/> - <antcall target="tomahawk-javadoc"/> - </target> - <target name="jaybird"> - <exec executable="mvn.bat"> - <arg value="install:install-file"/> - <arg value="-Dfile=./jaybird/jaybird-full-2.0.1.jar"/> - <arg value="-DgroupId=jaybird"/> - <arg value="-DartifactId=jaybird-full"/> - <arg value="-Dversion=2.0.1"/> - <arg value="-Dpackaging=jar"/> - </exec> - </target> - <target name="jta"> - <exec executable="mvn.bat"> - <arg value="install:install-file"/> - <arg value="-Dfile=./javax.transaction/jta-1.0.1B.jar"/> - <arg value="-DgroupId=javax.transaction"/> - <arg value="-DartifactId=jtal"/> - <arg value="-Dversion=1.0.1B"/> - <arg value="-Dpackaging=jar"/> - </exec> - </target> - <target name="tomahawk"> - <exec executable="mvn.bat"> - <arg value="install:install-file"/> - <arg value="-Dfile=./myfaces/tomahawk-1.1.2.jar"/> - <arg value="-DgroupId=org.apache.myfaces.tomahawk"/> - <arg value="-DartifactId=tomahawk"/> - <arg value="-Dversion=1.1.2"/> - <arg value="-Dpackaging=jar"/> - </exec> - </target> - <target name="tomahawk-javadoc"> - <exec executable="mvn.bat"> - <arg value="install:install-file"/> - <arg value="-Dfile=./myfaces/tomahawk-1.1.2.jar"/> - <arg value="-DgroupId=org.apache.myfaces.tomahawk"/> - <arg value="-DartifactId=tomahawk"/> - <arg value="-Dversion=1.1.2"/> - <arg value="-Dpackaging=javadoc"/> - </exec> - </target> -</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-24 18:28:49
|
Revision: 49 Author: idueppe Date: 2006-05-24 11:28:38 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=49&view=rev Log Message: ----------- improvements Modified Paths: -------------- trunk/openuss/tools/missing-dependencies/install-missing.xml Modified: trunk/openuss/tools/missing-dependencies/install-missing.xml =================================================================== --- trunk/openuss/tools/missing-dependencies/install-missing.xml 2006-05-23 12:19:58 UTC (rev 48) +++ trunk/openuss/tools/missing-dependencies/install-missing.xml 2006-05-24 18:28:38 UTC (rev 49) @@ -1,7 +1,9 @@ <project name="install-mising-files" default="install-all" basedir="."> <target name="install-all"> <antcall target="jaybird"/> - <antcall target="jta"/> + <antcall target="jta"/> + <antcall target="tomahawk"/> + <antcall target="tomahawk-javadoc"/> </target> <target name="jaybird"> <exec executable="mvn.bat"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-23 12:20:28
|
Revision: 48 Author: idueppe Date: 2006-05-23 05:19:58 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=48&view=rev Log Message: ----------- separate generated test sources(target/test-src) from manual test sources (src/test/java. Modified Paths: -------------- trunk/openuss/foundation/foundation-core/.classpath trunk/openuss/foundation/foundation-core/.project trunk/openuss/foundation/foundation-core/build.xml trunk/openuss/foundation/foundation-core/pom.xml trunk/openuss/foundation/foundation-model/pom.xml trunk/openuss/foundation/foundation-web/build.xml trunk/openuss/foundation/foundation-web/pom.xml trunk/openuss/foundation/pom.xml trunk/openuss/pom.xml Removed Paths: ------------- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java Modified: trunk/openuss/foundation/foundation-core/.classpath =================================================================== --- trunk/openuss/foundation/foundation-core/.classpath 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/.classpath 2006-05-23 12:19:58 UTC (rev 48) @@ -1,30 +1,30 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry output="target/test-classes" kind="src" path="src/test/java"/> - <classpathentry output="target/test-classes" kind="src" path="src/test/resources"/> - <classpathentry kind="src" path="target/src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry sourcepath="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4-sources.jar" kind="var" path="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4.jar"/> - <classpathentry sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar" kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar"/> - <classpathentry sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar" kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/> - <classpathentry sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar" kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar"/> - <classpathentry sourcepath="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1-sources.jar" kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1.jar"/> - <classpathentry sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar" kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/> - <classpathentry sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar" kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/> - <classpathentry sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar" kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> - <classpathentry sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar" kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/> - <classpathentry sourcepath="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1-sources.jar" kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar"/> - <classpathentry sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar" kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> - <classpathentry sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar" kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/> - <classpathentry kind="src" path="/foundation-api"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m4/spring-mock-2.0-m4.jar"/> - <classpathentry sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar" kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/> - <classpathentry sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2-sources.jar" kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> - <classpathentry sourcepath="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1-sources.jar" kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar"/> - <classpathentry sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> - <classpathentry sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar" kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> - <classpathentry sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar" kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/> + <classpathentry kind="src" path="target/src"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar" sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m4/spring-mock-2.0-m4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/openuss/foundation/foundation-api/3.0-SNAPSHOT/foundation-api-3.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/openuss/foundation/foundation-api/3.0-SNAPSHOT/foundation-api-3.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar" sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4.jar" sourcepath="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar" sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/openuss/framework/framework-utilities/3.0-SNAPSHOT/framework-utilities-3.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar" sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1-sources.jar"/> +</classpath> \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/.project =================================================================== --- trunk/openuss/foundation/foundation-core/.project 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/.project 2006-05-23 12:19:58 UTC (rev 48) @@ -1,9 +1,7 @@ <projectDescription> <name>foundation-core</name> <comment/> - <projects> - <project>foundation-api</project> - </projects> + <projects/> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> Modified: trunk/openuss/foundation/foundation-core/build.xml =================================================================== --- trunk/openuss/foundation/foundation-core/build.xml 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/build.xml 2006-05-23 12:19:58 UTC (rev 48) @@ -1,7 +1,7 @@ <project name="openuss :: foundation :: core :: build" default="install" basedir="."> <target name="compile"> <exec executable="mvn.bat"> - <arg line="install" /> + <arg line="compile" /> </exec> </target> <target name="clean"> Modified: trunk/openuss/foundation/foundation-core/pom.xml =================================================================== --- trunk/openuss/foundation/foundation-core/pom.xml 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/pom.xml 2006-05-23 12:19:58 UTC (rev 48) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openuss.foundation</groupId> @@ -79,7 +79,33 @@ <groupId>org.springframework</groupId> <artifactId>spring-mock</artifactId> <scope>test</scope> - </dependency> + </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source> + ${project.build.directory}/test-src + </source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Deleted: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java 2006-05-23 12:19:58 UTC (rev 48) @@ -1,41 +0,0 @@ -// OpenUSS - Open Source University Support System -/** - * This is only generated once! It will never be overwritten. - * You can (and have to!) safely modify it by hand. - */ -package org.openuss.foundation.lecture; - -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; -import org.apache.log4j.Logger; - - -/** - * JUnit Test for Spring Hibernate EnrollmentDao class. - * @see org.openuss.foundation.lecture.EnrollmentDao - */ -public abstract class EnrollmentDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { - - protected static final Logger logger = Logger.getLogger(EnrollmentDaoTest.class); - - protected EnrollmentDao enrollmentDao; - - public EnrollmentDao getEnrollmentDao() { - return enrollmentDao; - } - - public void setEnrollmentDao(EnrollmentDao enrollmentDao) { - this.enrollmentDao = enrollmentDao; - } - - public void testEnrollmentDaoInjection() { - assertNotNull(enrollmentDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } -} \ No newline at end of file Deleted: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java 2006-05-23 12:19:58 UTC (rev 48) @@ -1,41 +0,0 @@ -// OpenUSS - Open Source University Support System -/** - * This is only generated once! It will never be overwritten. - * You can (and have to!) safely modify it by hand. - */ -package org.openuss.foundation.lecture; - -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; -import org.apache.log4j.Logger; - - -/** - * JUnit Test for Spring Hibernate FacultyDao class. - * @see org.openuss.foundation.lecture.FacultyDao - */ -public abstract class FacultyDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { - - protected static final Logger logger = Logger.getLogger(FacultyDaoTest.class); - - protected FacultyDao facultyDao; - - public FacultyDao getFacultyDao() { - return facultyDao; - } - - public void setFacultyDao(FacultyDao facultyDao) { - this.facultyDao = facultyDao; - } - - public void testFacultyDaoInjection() { - assertNotNull(facultyDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } -} \ No newline at end of file Deleted: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java 2006-05-23 12:19:58 UTC (rev 48) @@ -1,41 +0,0 @@ -// OpenUSS - Open Source University Support System -/** - * This is only generated once! It will never be overwritten. - * You can (and have to!) safely modify it by hand. - */ -package org.openuss.foundation.lecture; - -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; -import org.apache.log4j.Logger; - - -/** - * JUnit Test for Spring Hibernate PeriodDao class. - * @see org.openuss.foundation.lecture.PeriodDao - */ -public abstract class PeriodDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { - - protected static final Logger logger = Logger.getLogger(PeriodDaoTest.class); - - protected PeriodDao periodDao; - - public PeriodDao getPeriodDao() { - return periodDao; - } - - public void setPeriodDao(PeriodDao periodDao) { - this.periodDao = periodDao; - } - - public void testPeriodDaoInjection() { - assertNotNull(periodDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } -} \ No newline at end of file Deleted: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java 2006-05-23 12:19:58 UTC (rev 48) @@ -1,41 +0,0 @@ -// OpenUSS - Open Source University Support System -/** - * This is only generated once! It will never be overwritten. - * You can (and have to!) safely modify it by hand. - */ -package org.openuss.foundation.lecture; - -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; -import org.apache.log4j.Logger; - - -/** - * JUnit Test for Spring Hibernate SubjectDao class. - * @see org.openuss.foundation.lecture.SubjectDao - */ -public abstract class SubjectDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { - - protected static final Logger logger = Logger.getLogger(SubjectDaoTest.class); - - protected SubjectDao subjectDao; - - public SubjectDao getSubjectDao() { - return subjectDao; - } - - public void setSubjectDao(SubjectDao subjectDao) { - this.subjectDao = subjectDao; - } - - public void testSubjectDaoInjection() { - assertNotNull(subjectDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } -} \ No newline at end of file Modified: trunk/openuss/foundation/foundation-model/pom.xml =================================================================== --- trunk/openuss/foundation/foundation-model/pom.xml 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-model/pom.xml 2006-05-23 12:19:58 UTC (rev 48) @@ -100,7 +100,7 @@ </core.tests.manual.dir> <!-- @TODO: Need to be separated --> <core.tests.generated.dir> - ${pom.basedir}/../foundation-core/src/test/java + ${pom.basedir}/../foundation-core/target/test-src </core.tests.generated.dir> <web.generated.dir> ${pom.basedir}/../foundation-web/target/src Modified: trunk/openuss/foundation/foundation-web/build.xml =================================================================== --- trunk/openuss/foundation/foundation-web/build.xml 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-web/build.xml 2006-05-23 12:19:58 UTC (rev 48) @@ -11,12 +11,12 @@ </target> <target name="install"> <exec executable="mvn.bat"> - <arg line="-e install"/> + <arg line="install"/> </exec> </target> <target name="eclipse"> <exec executable="mvn.bat"> - <arg line="eclipse:eclipse"/> + <arg line="eclipse:eclipse -DdownloadSources=true -Dwtpversion=1.0"/> </exec> </target> <target name="tomcat start"> Modified: trunk/openuss/foundation/foundation-web/pom.xml =================================================================== --- trunk/openuss/foundation/foundation-web/pom.xml 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/foundation-web/pom.xml 2006-05-23 12:19:58 UTC (rev 48) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openuss.foundation</groupId> @@ -16,30 +16,23 @@ <dependencies> <dependency> - <groupId>org.ejosa</groupId> - <artifactId>piggybank-api</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.openuss.foundation</groupId> + <artifactId>foundation-core</artifactId> + <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.ejosa</groupId> - <artifactId>piggybank-core</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> </dependency> <dependency> - <groupId>myfaces</groupId> - <artifactId>myfaces-all</artifactId> - <version>[1.1.1,)</version> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> </dependency> <dependency> - <groupId>myfaces</groupId> + <groupId>org.apache.myfaces.tomahawk</groupId> <artifactId>tomahawk</artifactId> - <version>[1.1.1,)</version> </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.1.1</version> - </dependency> + </dependencies> - + </project> Modified: trunk/openuss/foundation/pom.xml =================================================================== --- trunk/openuss/foundation/pom.xml 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/foundation/pom.xml 2006-05-23 12:19:58 UTC (rev 48) @@ -45,7 +45,7 @@ <module>foundation-model</module> <module>foundation-api</module> <module>foundation-core</module> - <module>foundation-web</module> +<!-- <module>foundation-web</module>--> </modules> </project> Modified: trunk/openuss/pom.xml =================================================================== --- trunk/openuss/pom.xml 2006-05-23 10:33:13 UTC (rev 47) +++ trunk/openuss/pom.xml 2006-05-23 12:19:58 UTC (rev 48) @@ -68,12 +68,32 @@ <artifactId>hibernate</artifactId> <version>[3.1.3,)</version> </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>[2.1,)</version> </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>[1.1.3,)</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>[1.1.3,)</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.tomahawk</groupId> + <artifactId>tomahawk</artifactId> + <version>[1.1.2,)</version> + </dependency> + + + + <dependency> <groupId>org.springframework</groupId> <artifactId>spring</artifactId> <version>[2.0-m1,)</version> @@ -185,8 +205,6 @@ <version>3.2-RC1-SNAPSHOT</version> <scope>runtime</scope> </dependency> - - </dependencies> </dependencyManagement> @@ -210,6 +228,7 @@ <version>3.2-RC1-SNAPSHOT</version> <executions> <execution> + <id>add-source</id> <goals> <goal>add-source</goal> </goals> @@ -357,6 +376,13 @@ <url>http://repo1.ibilio.org/maven2</url> </repository> <repository> + <id>myfaces-apache</id> + <name>myfaces-apache</name> + <url> + http://myfaces.zones.apache.org/dist/maven-repository/ + </url> + </repository> + <repository> <id>apache</id> <name>apache</name> <url>http://cvs.apache.org/repository</url> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <is...@us...> - 2006-05-23 10:33:20
|
Revision: 47 Author: isarsu Date: 2006-05-23 03:33:13 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=47&view=rev Log Message: ----------- Changed name from ejosa.home to project.home Modified Paths: -------------- trunk/openuss/servers/servers.properties Modified: trunk/openuss/servers/servers.properties =================================================================== --- trunk/openuss/servers/servers.properties 2006-05-23 09:45:11 UTC (rev 46) +++ trunk/openuss/servers/servers.properties 2006-05-23 10:33:13 UTC (rev 47) @@ -5,11 +5,11 @@ ## named "servers.${user.name}.properties" with the properties to overwrite. ## -ejosa.home=./../ +project.home=./../ # Properties for Tomcat Server tomcat.base=. -tomcat.home=${ejosa.home}/servers/tomcat +tomcat.home=${project.home}/servers/tomcat tomcat.server=localhost tomcat.manager.url=http://${tomcat.server}:8080/manager tomcat.username=manager This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-23 09:45:23
|
Revision: 46 Author: idueppe Date: 2006-05-23 02:45:11 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=46&view=rev Log Message: ----------- added myfaces and tomahawk to managed-dependencies Modified Paths: -------------- trunk/openuss/foundation/pom.xml Modified: trunk/openuss/foundation/pom.xml =================================================================== --- trunk/openuss/foundation/pom.xml 2006-05-23 09:30:01 UTC (rev 45) +++ trunk/openuss/foundation/pom.xml 2006-05-23 09:45:11 UTC (rev 46) @@ -45,6 +45,7 @@ <module>foundation-model</module> <module>foundation-api</module> <module>foundation-core</module> + <module>foundation-web</module> </modules> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-23 09:31:01
|
Revision: 45 Author: idueppe Date: 2006-05-23 02:30:01 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=45&view=rev Log Message: ----------- added tomahawk 1.1.2 to missing dependencies Modified Paths: -------------- trunk/openuss/tools/missing-dependencies/install-missing.xml trunk/openuss/tools/missing-dependencies/readme.txt Added Paths: ----------- trunk/openuss/tools/missing-dependencies/myfaces/ trunk/openuss/tools/missing-dependencies/myfaces/tomahawk-1.1.2-javadoc.jar trunk/openuss/tools/missing-dependencies/myfaces/tomahawk-1.1.2.jar Modified: trunk/openuss/tools/missing-dependencies/install-missing.xml =================================================================== --- trunk/openuss/tools/missing-dependencies/install-missing.xml 2006-05-21 09:58:51 UTC (rev 44) +++ trunk/openuss/tools/missing-dependencies/install-missing.xml 2006-05-23 09:30:01 UTC (rev 45) @@ -23,4 +23,24 @@ <arg value="-Dpackaging=jar"/> </exec> </target> + <target name="tomahawk"> + <exec executable="mvn.bat"> + <arg value="install:install-file"/> + <arg value="-Dfile=./myfaces/tomahawk-1.1.2.jar"/> + <arg value="-DgroupId=org.apache.myfaces.tomahawk"/> + <arg value="-DartifactId=tomahawk"/> + <arg value="-Dversion=1.1.2"/> + <arg value="-Dpackaging=jar"/> + </exec> + </target> + <target name="tomahawk-javadoc"> + <exec executable="mvn.bat"> + <arg value="install:install-file"/> + <arg value="-Dfile=./myfaces/tomahawk-1.1.2.jar"/> + <arg value="-DgroupId=org.apache.myfaces.tomahawk"/> + <arg value="-DartifactId=tomahawk"/> + <arg value="-Dversion=1.1.2"/> + <arg value="-Dpackaging=javadoc"/> + </exec> + </target> </project> Added: trunk/openuss/tools/missing-dependencies/myfaces/tomahawk-1.1.2-javadoc.jar =================================================================== (Binary files differ) Property changes on: trunk/openuss/tools/missing-dependencies/myfaces/tomahawk-1.1.2-javadoc.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/openuss/tools/missing-dependencies/myfaces/tomahawk-1.1.2.jar =================================================================== (Binary files differ) Property changes on: trunk/openuss/tools/missing-dependencies/myfaces/tomahawk-1.1.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/openuss/tools/missing-dependencies/readme.txt =================================================================== --- trunk/openuss/tools/missing-dependencies/readme.txt 2006-05-21 09:58:51 UTC (rev 44) +++ trunk/openuss/tools/missing-dependencies/readme.txt 2006-05-23 09:30:01 UTC (rev 45) @@ -6,6 +6,10 @@ Jaybird 2.0.1 is not deployed to remote repositories Sun Microsystems - Java Transaction API +JTA 1.0.1B needed by current Spring Framework Due to license restrictions this jar is not deployed to public repositories. +MyFaces - Tomahawk 1.1.2 +Is not proper deployed on repositories + ----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-21 09:58:56
|
Revision: 44 Author: idueppe Date: 2006-05-21 02:58:51 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=44&view=rev Log Message: ----------- Property Changed: ---------------- trunk/openuss/documentation/ Property changes on: trunk/openuss/documentation ___________________________________________________________________ Name: svn:ignore + model This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-21 09:57:19
|
Revision: 43 Author: idueppe Date: 2006-05-21 02:57:13 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=43&view=rev Log Message: ----------- add framework module Added Paths: ----------- trunk/openuss/documentation/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-21 09:56:58
|
Revision: 42 Author: idueppe Date: 2006-05-21 02:56:49 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=42&view=rev Log Message: ----------- add framework module Modified Paths: -------------- trunk/openuss/build.xml trunk/openuss/pom.xml Modified: trunk/openuss/build.xml =================================================================== --- trunk/openuss/build.xml 2006-05-21 09:54:46 UTC (rev 41) +++ trunk/openuss/build.xml 2006-05-21 09:56:49 UTC (rev 42) @@ -9,6 +9,11 @@ <arg line="-e install"/> </exec> </target> + <target name="install w/o tests"> + <exec executable="mvn.bat"> + <arg line="-e install -Dmaven.test.skip=true"/> + </exec> + </target> <target name="clean-all"> <exec executable="mvn.bat"> <arg line="-o clean"/> Modified: trunk/openuss/pom.xml =================================================================== --- trunk/openuss/pom.xml 2006-05-21 09:54:46 UTC (rev 41) +++ trunk/openuss/pom.xml 2006-05-21 09:56:49 UTC (rev 42) @@ -45,7 +45,10 @@ </url> </scm> + <!-- Modules --> + <modules> + <module>framework</module> <module>foundation</module> </modules> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-21 09:55:21
|
Revision: 41 Author: idueppe Date: 2006-05-21 02:54:46 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=41&view=rev Log Message: ----------- separate specification from business like the ejosa style. Entity.Factory search now for Factories in the Classpath respectively looking for a META-INF/service/entity.name property file. Modified Paths: -------------- trunk/openuss/foundation/foundation-api/.classpath trunk/openuss/foundation/foundation-api/pom.xml trunk/openuss/foundation/foundation-core/.classpath trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyDaoImpl.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip Added Paths: ----------- trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/EnrollmentImpl.java trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyImpl.java trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/PeriodImpl.java trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/SubjectImpl.java trunk/openuss/foundation/foundation-core/src/main/resources/ trunk/openuss/foundation/foundation-model/src/main/config/mappings/HibernateMergeMappings.xml Modified: trunk/openuss/foundation/foundation-api/.classpath =================================================================== --- trunk/openuss/foundation/foundation-api/.classpath 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-api/.classpath 2006-05-21 09:54:46 UTC (rev 41) @@ -1,8 +1,10 @@ -<classpath> - <classpathentry kind="src" path="target/src"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-sources.jar"/> -</classpath> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="target/src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry sourcepath="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-sources.jar" kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/> + <classpathentry sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar" kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/> + <classpathentry sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar" kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/framework-utilities"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: trunk/openuss/foundation/foundation-api/pom.xml =================================================================== --- trunk/openuss/foundation/foundation-api/pom.xml 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-api/pom.xml 2006-05-21 09:54:46 UTC (rev 41) @@ -21,6 +21,11 @@ <artifactId>commons-beanutils</artifactId> <version>1.7.0</version> </dependency> + <dependency> + <groupId>org.openuss.framework</groupId> + <artifactId>framework-utilities</artifactId> + <version>${pom.version}</version> + </dependency> </dependencies> </project> Modified: trunk/openuss/foundation/foundation-core/.classpath =================================================================== --- trunk/openuss/foundation/foundation-core/.classpath 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-core/.classpath 2006-05-21 09:54:46 UTC (rev 41) @@ -1,28 +1,30 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/> - <classpathentry kind="src" path="target/src"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar" sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar" sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m4/spring-mock-2.0-m4.jar"/> - <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar" sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar" sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar"/> - <classpathentry kind="src" path="/foundation-api"/> - <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4.jar" sourcepath="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> -</classpath> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources"/> + <classpathentry output="target/test-classes" kind="src" path="src/test/java"/> + <classpathentry output="target/test-classes" kind="src" path="src/test/resources"/> + <classpathentry kind="src" path="target/src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry sourcepath="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4-sources.jar" kind="var" path="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4.jar"/> + <classpathentry sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar" kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar"/> + <classpathentry sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar" kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/> + <classpathentry sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar" kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar"/> + <classpathentry sourcepath="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1-sources.jar" kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1.jar"/> + <classpathentry sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar" kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/> + <classpathentry sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar" kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/> + <classpathentry sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar" kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> + <classpathentry sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar" kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/> + <classpathentry sourcepath="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1-sources.jar" kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar"/> + <classpathentry sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar" kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> + <classpathentry sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar" kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/> + <classpathentry kind="src" path="/foundation-api"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m4/spring-mock-2.0-m4.jar"/> + <classpathentry sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar" kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/> + <classpathentry sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2-sources.jar" kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> + <classpathentry sourcepath="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1-sources.jar" kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar"/> + <classpathentry sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> + <classpathentry sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar" kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> + <classpathentry sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar" kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/EnrollmentImpl.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/EnrollmentImpl.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/EnrollmentImpl.java 2006-05-21 09:54:46 UTC (rev 41) @@ -0,0 +1,20 @@ +// OpenUSS - Open Source University Support System +// +// Attention: Generated code! Do not modify by hand! +// Generated by: HibernateEntity.vsl in andromda-hibernate-cartridge. +// +package org.openuss.foundation.lecture; + +/** + * @see org.openuss.foundation.lecture.Enrollment + */ +public class EnrollmentImpl + extends org.openuss.foundation.lecture.EnrollmentBase + implements org.openuss.foundation.lecture.Enrollment +{ + /** + * The serial version UID of this class. Needed for serialization. + */ + private static final long serialVersionUID = -5670314763540215921L; + +} \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyDaoImpl.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyDaoImpl.java 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyDaoImpl.java 2006-05-21 09:54:46 UTC (rev 41) @@ -1,4 +1,4 @@ -// license-header java merge-point +// OpenUSS - Open Source University Support System /** * This is only generated once! It will never be overwritten. * You can (and have to!) safely modify it by hand. Added: trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyImpl.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyImpl.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyImpl.java 2006-05-21 09:54:46 UTC (rev 41) @@ -0,0 +1,20 @@ +// OpenUSS - Open Source University Support System +// +// Attention: Generated code! Do not modify by hand! +// Generated by: HibernateEntity.vsl in andromda-hibernate-cartridge. +// +package org.openuss.foundation.lecture; + +/** + * @see org.openuss.foundation.lecture.Faculty + */ +public class FacultyImpl + extends org.openuss.foundation.lecture.FacultyBase + implements org.openuss.foundation.lecture.Faculty +{ + /** + * The serial version UID of this class. Needed for serialization. + */ + private static final long serialVersionUID = 2164596673303053977L; + +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/PeriodImpl.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/PeriodImpl.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/PeriodImpl.java 2006-05-21 09:54:46 UTC (rev 41) @@ -0,0 +1,20 @@ +// OpenUSS - Open Source University Support System +// +// Attention: Generated code! Do not modify by hand! +// Generated by: HibernateEntity.vsl in andromda-hibernate-cartridge. +// +package org.openuss.foundation.lecture; + +/** + * @see org.openuss.foundation.lecture.Period + */ +public class PeriodImpl + extends org.openuss.foundation.lecture.PeriodBase + implements org.openuss.foundation.lecture.Period +{ + /** + * The serial version UID of this class. Needed for serialization. + */ + private static final long serialVersionUID = 9086031628022698697L; + +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/SubjectImpl.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/SubjectImpl.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/SubjectImpl.java 2006-05-21 09:54:46 UTC (rev 41) @@ -0,0 +1,20 @@ +// OpenUSS - Open Source University Support System +// +// Attention: Generated code! Do not modify by hand! +// Generated by: HibernateEntity.vsl in andromda-hibernate-cartridge. +// +package org.openuss.foundation.lecture; + +/** + * @see org.openuss.foundation.lecture.Subject + */ +public class SubjectImpl + extends org.openuss.foundation.lecture.SubjectBase + implements org.openuss.foundation.lecture.Subject +{ + /** + * The serial version UID of this class. Needed for serialization. + */ + private static final long serialVersionUID = -3094289073434197423L; + +} \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java 2006-05-21 09:54:46 UTC (rev 41) @@ -5,19 +5,154 @@ */ package org.openuss.foundation.lecture; +import org.springframework.dao.DataAccessException; + /** * JUnit Test for Spring Hibernate EnrollmentDao class. * @see org.openuss.foundation.lecture.EnrollmentDao */ public class EnrollmentDaoTest extends EnrollmentDaoTestBase { + private FacultyDao facultyDao; + private SubjectDao subjectDao; + private PeriodDao periodDao; + + public void setFacultyDao(FacultyDao facultyDao) { + this.facultyDao = facultyDao; + } + + public FacultyDao getFacultyDao() { + return facultyDao; + } + + public void setSubjectDao(SubjectDao subjectDao) { + this.subjectDao = subjectDao; + } + + public SubjectDao getSubjectDao() { + return subjectDao; + } + + public void setPeriodDao(PeriodDao periodDao) { + this.periodDao = periodDao; + } + + public PeriodDao getPeriodDao() { + return periodDao; + } + + public void testFacultyDaoInjection() { + assertNotNull(facultyDao); + } + + public void testSubjectDaoInjection() { + assertNotNull(subjectDao); + } + + public void testPeriodDaoInjection() { + assertNotNull(periodDao); + } + + public void testEnrollmentUniqueShortcut() { + // create faculty + Faculty faculty = createFaculty(); + facultyDao.create(faculty); + assertNotNull(faculty); + + // create subject + Subject subject = createSubject(faculty); + subject.setFaculty(faculty); + subjectDao.create(subject); + assertNotNull(subjectDao); + + //create period + Period period = createPeriod(); + period.setFaculty(faculty); + periodDao.create(period); + assertNotNull(periodDao); + + // create first enrollment + Enrollment enrollment = new EnrollmentImpl(); + enrollment.setFaculty(faculty); + enrollment.setSubject(subject); + enrollment.setPeriod(period); + enrollment.setShortcut("shortcut"); + assertNull(enrollment.getId()); + enrollmentDao.create(enrollment); + assertNotNull(enrollment.getId()); + + // create first enrollment + Enrollment enrollment2 = new EnrollmentImpl(); + enrollment2.setFaculty(faculty); + enrollment2.setSubject(subject); + enrollment2.setPeriod(period); + enrollment2.setShortcut("shortcut"); + assertNull(enrollment2.getId()); + enrollmentDao.create(enrollment2); + assertNotNull(enrollment2.getId()); + + try { + setComplete(); + endTransaction(); + } catch (DataAccessException e) { + // success - unique key constraint + } + + + } + public void testEnrollmentDaoCreate() { - Faculty faculty = new FacultyImpl(); + // create faculty + Faculty faculty = createFaculty(); + facultyDao.create(faculty); + assertNotNull(faculty); + + // create subject + Subject subject = createSubject(faculty); + subject.setFaculty(faculty); + subjectDao.create(subject); + assertNotNull(subjectDao); + + //create period + Period period = createPeriod(); + period.setFaculty(faculty); + assertNull(period.getId()); + periodDao.create(period); + assertNotNull(period.getId()); + Enrollment enrollment = new EnrollmentImpl(); enrollment.setFaculty(faculty); + enrollment.setSubject(subject); + enrollment.setPeriod(period); + enrollment.setShortcut("shortcut"); + assertNull(enrollment.getId()); enrollmentDao.create(enrollment); assertNotNull(enrollment.getId()); } + + private Period createPeriod() { + Period period = Period.Factory.newInstance(); + period.setName("name"); + return period; + } + + private Subject createSubject(Faculty faculty) { + Subject subject = Subject.Factory.newInstance(); + subject.setName("name"); + subject.setShortcut("shortcut"); + subject.setFaculty(faculty); + return subject; + } + + private Faculty createFaculty() { + Faculty faculty = Faculty.Factory.newInstance(); + faculty.setName("name"); + faculty.setShortcut("shortcut"); + faculty.setOwner("owner"); + return faculty; + } + + } \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java 2006-05-21 09:54:46 UTC (rev 41) @@ -5,6 +5,7 @@ */ package org.openuss.foundation.lecture; +import org.springframework.dao.DataAccessException; /** * JUnit Test for Spring Hibernate FacultyDao class. @@ -30,11 +31,20 @@ assertNull(faculty2.getId()); facultyDao.create(faculty2); assertNotNull(faculty2.getId()); - + + try { + setComplete(); + endTransaction(); + fail(); + } catch (DataAccessException e) { + // success - unique constraint + } } private Faculty createTestFaculty() { - Faculty faculty = new FacultyImpl(); +// String className = FacultyBase.Factory.class.getName(); +// System.out.println(className); + Faculty faculty = Faculty.Factory.newInstance(); faculty.setName("name"); faculty.setShortcut("shortcut"); faculty.setOwner("owner"); Modified: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java 2006-05-21 09:54:46 UTC (rev 41) @@ -12,11 +12,39 @@ */ public class PeriodDaoTest extends PeriodDaoTestBase { + private FacultyDao facultyDao; + public void testPeriodDaoCreate() { + Faculty faculty = Faculty.Factory.newInstance(); + faculty.setName("name"); + faculty.setOwner("owner"); + faculty.setShortcut("shortcut"); + assertNull(faculty.getId()); + facultyDao.create(faculty); + assertNotNull(faculty.getId()); + Period period = new PeriodImpl(); + period.setFaculty(faculty); period.setName(" "); assertNull(period.getId()); periodDao.create(period); assertNotNull(period.getId()); } + + public void testPeriodFactory() { + Period period = Period.Factory.newInstance(); + assertNotNull(period); + } + + public void testFacultyDaoInjection() { + assertNotNull(facultyDao); + } + + public FacultyDao getFacultyDao() { + return facultyDao; + } + + public void setFacultyDao(FacultyDao facultyDao) { + this.facultyDao = facultyDao; + } } \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties 2006-05-21 09:54:46 UTC (rev 41) @@ -2,11 +2,11 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%p %c - %m%n #log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n -log4j.rootLogger=INFO, stdout -log4j.logger.org.springframework=INFO -log4j.logger.org.hibernate=INFO +log4j.rootLogger=ERROR, stdout +log4j.logger.org.springframework=ERROR +log4j.logger.org.hibernate=ERROR -log4j.logger.org.openuss=DEBUG +log4j.logger.org.openuss=ERROR # Configure logging for testing: optionally with log file # log4j.rootLogger=DEBUG, stdout Modified: trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-21 09:54:16 UTC (rev 40) +++ trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-21 09:54:46 UTC (rev 41) @@ -71,7 +71,7 @@ <property name="hibernateDialect">org.hibernate.dialect.FirebirdDialect</property> <property name="hibernateHbm2DDLAuto">create</property> - <property name="hibernateShowSql">true</property> + <property name="hibernateShowSql">false</property> <!-- Spring Configuration for proper support of hibernate 3.x --> @@ -88,10 +88,12 @@ <namespace name="hibernate"> <properties> + <property name="mergeMappingsUri">file:${config.dir}/mappings/HibernateMergeMappings.xml</property> <property name="defaultHibernateGeneratorClass">sequence</property> <property name="hibernateTypeMappingsUri">Hibernate</property> - <property name="entities">${api.generated.dir}</property> + <property name="entities">${core.generated.dir}</property> <property name="entity-impls">${core.manual.dir}</property> + <property name="entity-interfaces">${api.generated.dir}</property> <property name="entity-mappings">${core.generated.dir}</property> <property name="user-types">${core.generated.dir}</property> Added: trunk/openuss/foundation/foundation-model/src/main/config/mappings/HibernateMergeMappings.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/mappings/HibernateMergeMappings.xml (rev 0) +++ trunk/openuss/foundation/foundation-model/src/main/config/mappings/HibernateMergeMappings.xml 2006-05-21 09:54:46 UTC (rev 41) @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + +<mappings name="CoreMerge"> + <mapping> + <from><![CDATA[license-header java merge-point]]></from> + <to><![CDATA[OpenUSS - Open Source University Support System]]></to> + </mapping> + + <!-- GenerateTest Merge --> + <mapping> + <from><![CDATA[<!-- namespace-propertyGroup merge-point -->]]></from> + <to> +<![CDATA[ + <propertyGroup name="CustomOutlets"> + <documentation> + Custom outlets + </documentation> + <property name="entity-interfaces"> + <documentation>Folder for entity base classes</documentation> + </property> + </propertyGroup> +]]> + </to> + </mapping> + + <mapping> + <from><![CDATA[<template + path="templates/hibernate/HibernateEntity.vsl" + outputPattern="$generatedFile" + outlet="entities" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.hibernate.metafacades.HibernateEntity"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/hibernate/HibernateEntityImpl.vsl" + outputPattern="$generatedFile" + outlet="entities" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.hibernate.metafacades.HibernateEntity"> + <property name="businessOperationsPresent">false</property> + </type> + </modelElement> + </modelElements> + </template> + + <template + path="templates/hibernate/HibernateEntityImpl.vsl" + outputPattern="$generatedFile" + outlet="entity-impls" + overwrite="false"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.hibernate.metafacades.HibernateEntity"> + <property name="businessOperationsPresent"/> + </type> + </modelElement> + </modelElements> + </template>]]></from> + <to> +<![CDATA[ + <template + path="templates/hibernate/HibernateEntity.vsl" + outputPattern="$generatedFile" + outlet="entity-interfaces" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.hibernate.metafacades.HibernateEntity"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/hibernate/HibernateEntityBase.vsl" + outputPattern="$generatedFile" + outlet="entities" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.hibernate.metafacades.HibernateEntity"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/hibernate/MetaInfServiceFile.vsl" + outputPattern="$generatedFile" + outlet="entities" + overwrite="true"> + <modelElements variable="class"> + <modelElement> + <type name="org.andromda.cartridges.hibernate.metafacades.HibernateEntity"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/hibernate/HibernateEntityImpl.vsl" + outputPattern="$generatedFile" + outlet="entity-impls" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.hibernate.metafacades.HibernateEntity"/> + </modelElement> + </modelElements> + </template> +]]> + </to> + </mapping> + + <mapping> + <from><![CDATA[<!-- applicationContext hibernateProperties merge-point -->]]></from> + <to><![CDATA[ + <prop key="hibernate.format_sql">false</prop> + <prop key="hibernate.transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</prop> + <prop key="hibernate.current_session_context_class">thread</prop> + ]]></to> + </mapping> + +</mappings> \ No newline at end of file Modified: trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-21 09:54:27
|
Revision: 40 Author: idueppe Date: 2006-05-21 02:54:16 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=40&view=rev Log Message: ----------- separate specification from business like the ejosa style. Entity.Factory search now for Factories in the Classpath respectively looking for a META-INF/service/entity.name property file. Added Paths: ----------- trunk/openuss/foundation/foundation-model/src/templates/hibernate/ trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntity.vsl trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityBase.vsl trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityImpl.vsl trunk/openuss/foundation/foundation-model/src/templates/hibernate/MetaInfServiceFile.vsl Added: trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntity.vsl =================================================================== --- trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntity.vsl (rev 0) +++ trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntity.vsl 2006-05-21 09:54:16 UTC (rev 40) @@ -0,0 +1,173 @@ +#set ($generatedFile = "${entity.packagePath}/${entity.entityName}.java") +// license-header java merge-point +// +// Attention: Generated code! Do not modify by hand! +// Generated by: HibernateEntity.vsl in andromda-hibernate-cartridge. +// +#if ($stringUtils.isNotBlank($entity.packageName)) +package $entity.packageName; +#end + +/** +$entity.getDocumentation(" * ") + */ +public interface ${entity.entityName} +#if($entity.generalization) + extends $entity.generalization.fullyQualifiedEntityImplementationName +#if (!$entity.interfaceAbstractions.empty) + , $entity.implementedInterfaceList +#end +#else +#if (!$entity.interfaceAbstractions.empty) + extends $entity.implementedInterfaceList +#end +#end +{ + +#if ($stringUtils.isNotBlank($entity.hibernateVersionProperty)) +#if (!$entity.generalization || ($entity.generalization && !$entity.hibernateInheritanceSubclass)) +#set ($versionProperty = $entity.hibernateVersionProperty) +#set ($versionPropertyCapitalized = $stringUtils.capitalize($entity.hibernateVersionProperty)) + public int get$versionPropertyCapitalized(); + +#end +#end +#foreach ($attribute in $entity.attributes) +#set ($typeName = $attribute.type.fullyQualifiedName) +#if ($attribute.containsEmbeddedObject) +#set ($typeName = $attribute.type.fullyQualifiedEntityName) +#end + + /** +$attribute.getDocumentation(" * ") + */ + $attribute.visibility $typeName ${attribute.getterName}(); + + $attribute.visibility void ${attribute.setterName}(${typeName} $attribute.name); +#end +## Generate the associations +#foreach ($associationEnd in $entity.associationEnds) +#set ($target = $associationEnd.otherEnd) +#if ($target.navigable || ($associationEnd.child && $entity.foreignHibernateGeneratorClass)) + + /** +$target.getDocumentation(" * ") + */ + public $target.getterSetterTypeName ${target.getterName}(); + + public void ${target.setterName}($target.getterSetterTypeName ${target.name}); + +#end +#end +#foreach ($operation in $entity.businessOperations) +#set ($returnType = $operation.returnType) +#set ($signature = $operation.signature) + /** +$operation.getDocumentation(" * ") + */ +#if ($operation.exceptionsPresent) + $operation.visibility abstract $returnType.fullyQualifiedName $signature + throws $operation.exceptionList; +#else + $operation.visibility abstract $returnType.fullyQualifiedName $signature; +#end + +#end + +#if (!$entity.abstract) + /** + * Constructs new instances of {@link ${entity.fullyQualifiedName}}. + */ + public static abstract class Factory + { + + /** + * Singleton instance of the concrete factory + */ + private static ${entity.entityName}.Factory factory = null; + + /** + * Singleton method to obtain an instance of the concrete factory + */ + private static ${entity.entityName}.Factory getFactory() { + if (factory == null) { + factory = (${entity.entityName}.Factory) + org.openuss.framework.utilities.FactoryFinder.find("${entity.fullyQualifiedName}.Factory"); + } + return factory; + } + + /** + * Abstract factory method for the concrete product. + */ + public abstract ${entity.entityName} create${entity.entityName}(); + + /** + * Constructs a new instance of {@link ${entity.fullyQualifiedName}}. + */ + public static $entity.fullyQualifiedName newInstance() + { + return getFactory().create${entity.entityName}(); + } + +#if ($entity.allRequiredConstructorParameters.size() > $entity.identifiers.size() && $entity.allRequiredConstructorParameters.size() < $entity.allProperties.size()) + /** + * Constructs a new instance of {@link ${entity.fullyQualifiedName}}, taking all required and/or + * read-only properties as arguments. + */ + public static $entity.fullyQualifiedName newInstance(## no newline +#set ($comma = "") +#foreach ($property in $entity.allRequiredConstructorParameters) +#if ($entity.usingForeignIdentifier || !$property.identifier) +${comma}${property.getterSetterTypeName} ${property.name}## no newline +#set ($comma = ", ") +#end +#end +) + { + final ${entity.fullyQualifiedName} entity = getFactory().create${entity.entityName}(); +#foreach ($property in $entity.allRequiredConstructorParameters) +#if ($entity.usingForeignIdentifier || !$property.identifier) + entity.${property.setterName}(${property.name}); +#end +#end + return entity; + } +#end +#set ($propertiesPresent = false) +#foreach ($property in $entity.allProperties) +#if ($entity.usingForeignIdentifier || !$property.identifier) +#set ($propertiesPresent = true) +#end +#end +#if ($propertiesPresent) + + /** + * Constructs a new instance of {@link ${entity.fullyQualifiedName}}, taking all possible properties + * (except the identifier(s))as arguments. + */ + public static $entity.fullyQualifiedName newInstance(## no newline +#set ($comma = "") +#foreach ($property in $entity.allProperties) +#if ($entity.usingForeignIdentifier || !$property.identifier) +${comma}${property.getterSetterTypeName} ${property.name}## no newline +#set ($comma = ", ") +#end +#end +) + { + final ${entity.fullyQualifiedName} entity = getFactory().create${entity.entityName}(); +#foreach ($property in $entity.allProperties) +#if ($entity.usingForeignIdentifier || !$property.identifier) + entity.${property.setterName}(${property.name}); +#end +#end + return entity; + } +#end + } + +#end + +// HibernateEntity.vsl merge-point +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityBase.vsl =================================================================== --- trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityBase.vsl (rev 0) +++ trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityBase.vsl 2006-05-21 09:54:16 UTC (rev 40) @@ -0,0 +1,176 @@ +#set ($generatedFile = "${entity.packagePath}/${entity.entityName}Base.java") +// license-header java merge-point +// +// Attention: Generated code! Do not modify by hand! +// Generated by: HibernateEntity.vsl in andromda-hibernate-cartridge. +// +#if ($stringUtils.isNotBlank($entity.packageName)) +package $entity.packageName; +#end + +/** +$entity.getDocumentation(" * ") + */ +public abstract class ${entity.entityName}Base +#if($entity.generalization) + extends $entity.generalization.fullyQualifiedEntityImplementationName +#else + implements ${entity.entityName}, java.io.Serializable +#if (!$entity.interfaceAbstractions.empty) + , $entity.implementedInterfaceList +#end +#end +{ + /** + * The serial version UID of this class. Needed for serialization. + */ + private static final long serialVersionUID = ${entity.serialVersionUID}L; + +#if ($stringUtils.isNotBlank($entity.hibernateVersionProperty)) +#if (!$entity.generalization || ($entity.generalization && !$entity.hibernateInheritanceSubclass)) +#set ($versionProperty = $entity.hibernateVersionProperty) +#set ($versionPropertyCapitalized = $stringUtils.capitalize($entity.hibernateVersionProperty)) + /** + * Version property managed by Hibernate. + */ + private int $versionProperty; + + public int get$versionPropertyCapitalized() + { + return this.$versionProperty; + } + + private void set$versionPropertyCapitalized (int $versionProperty) + { + this.$versionProperty = $versionProperty; + } + +#end +#end +#foreach ($attribute in $entity.attributes) +#set ($typeName = $attribute.type.fullyQualifiedName) +#if ($attribute.containsEmbeddedObject) +#set ($typeName = $attribute.type.fullyQualifiedEntityName) +#end + private $typeName $attribute.name#if ($attribute.defaultValuePresent) = $attribute.defaultValue#end; + + /** + * @see ${entity.fullyQuilifiedName}#${attribute.getterName}() + */ + $attribute.visibility $typeName ${attribute.getterName}() + { + return this.${attribute.name}; + } + + /** + * @see ${entity.fullyQuilifiedName}#${attribute.setterName}(${typeName} $attribute.name) + */ + $attribute.visibility void ${attribute.setterName}(${typeName} $attribute.name) + { + this.${attribute.name} = $attribute.name; + } + +#end +## Generate the associations +#foreach ($associationEnd in $entity.associationEnds) +#set ($target = $associationEnd.otherEnd) +#if ($target.navigable || ($associationEnd.child && $entity.foreignHibernateGeneratorClass)) +#if ($target.many) + private $target.getterSetterTypeName $target.name = $target.collectionTypeImplementation; +#else + private $target.getterSetterTypeName $target.name; +#end + + /** +$target.getDocumentation(" * ") + */ + public $target.getterSetterTypeName ${target.getterName}() + { + return this.${target.name}; + } + + public void ${target.setterName}($target.getterSetterTypeName ${target.name}) + { + this.${target.name} = ${target.name}; + } + +#end +#end +#foreach ($operation in $entity.businessOperations) +#set ($returnType = $operation.returnType) +#set ($signature = $operation.signature) + /** +$operation.getDocumentation(" * ") + */ +#if ($operation.exceptionsPresent) + $operation.visibility abstract $returnType.fullyQualifiedName $signature + throws $operation.exceptionList; +#else + $operation.visibility abstract $returnType.fullyQualifiedName $signature; +#end + +#end +#if ($generateEntityEqualsAndHashCode.equalsIgnoreCase('true')) +#set ($identifiers = $entity.getIdentifiers(false)) + /** +#if ($identifiers.empty) + * This entity does not have any identifiers +#if ($entity.generalization) + * but since it extends the <code>$entity.generalization.fullyQualifiedEntityImplementationName</code> class + * it will simply delegate the call up there. + * + * @see $entity.generalization.fullyQualifiedEntityName#equals(Object) +#else + * and is not extending any other entity, + * so this method will only return <code>true</code> if the argument reference and <code>this</code> + * refer to the same object. +#end +#else +#if ($entity.generalization) + * Returns <code>true</code> if the argument is an $entity.entityName instance and all identifiers for this entity + * equal the identifiers of the argument entity. The <code>equals</code> method of the parent entity + * will also need to return <code>true</code>. Returns <code>false</code> otherwise. + * + * @see $entity.generalization.fullyQualifiedEntityName#equals(Object) +#else + * Returns <code>true</code> if the argument is an $entity.entityName instance and all identifiers for this entity + * equal the identifiers of the argument entity. Returns <code>false</code> otherwise. +#end +#end + */ +#renderEqualsMethod($entity $entity.entityName $identifiers) + + /** +#if ($identifiers.empty) + * This entity does not have any identifiers +#if ($entity.generalization) + * but since it extends the <code>$entity.generalization.fullyQualifiedEntityImplementationName</code> class + * it will simply delegate the call up there. + * + * @see $entity.generalization.fullyQualifiedEntityName#hashCode() +#else + * and is not extending any other entity, + * so this method will only take the identifiers of this entity into account when calculating the hash code. +#end +#else +#if ($entity.generalization) + * Returns a hash code based on this entity's identifiers and the hash code of the parent entity. + * + * @see $entity.generalization.fullyQualifiedEntityName#hashCode() +#else + * Returns a hash code based on this entity's identifiers. +#end +#end + */ +#renderHashCodeMethod($entity $identifiers) + + public static class Factory extends ${entity.entityName}.Factory { + + public ${entity.entityName} create${entity.entityName}() { + return new ${entity.entityImplementationName}(); + } + } + +#end +// HibernateEntity.vsl merge-point +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityImpl.vsl =================================================================== --- trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityImpl.vsl (rev 0) +++ trunk/openuss/foundation/foundation-model/src/templates/hibernate/HibernateEntityImpl.vsl 2006-05-21 09:54:16 UTC (rev 40) @@ -0,0 +1,53 @@ +#set ($generatedFile = "${entity.packagePath}/${entity.entityImplementationName}.java") +// license-header java merge-point +#if ($entity.businessOperationsPresent) +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +#else +// +// Attention: Generated code! Do not modify by hand! +// Generated by: HibernateEntity.vsl in andromda-hibernate-cartridge. +// +#end +#if ($stringUtils.isNotBlank($entity.packageName)) +package $entity.packageName; +#end + +/** + * @see $entity.fullyQualifiedEntityName + */ +public#if ($entity.abstract) abstract#end class $entity.entityImplementationName + extends ${entity.fullyQualifiedEntityName}Base + implements ${entity.fullyQualifiedEntityName} +{ + /** + * The serial version UID of this class. Needed for serialization. + */ + private static final long serialVersionUID = ${entity.serialVersionUID}L; + +#foreach ($operation in $entity.businessOperations) + /** + * @see ${entity.fullyQualifiedEntityName}#${operation.getSignature(false)} + */ +#set ($abstract = $entity.abstract && $operation.abstract) + $operation.visibility#if ($abstract) abstract#end $operation.returnType.fullyQualifiedName $operation.signature#if ($abstract && !$operation.exceptionsPresent);#end +#if ($operation.exceptionsPresent) + + throws $operation.exceptionList#if ($abstract);#end +#end +#if (!$abstract) + + { + // ${toDoTag} implement $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature +#if ($operation.returnTypePresent) + return $operation.returnType.javaNullString; +#else + throw new java.lang.UnsupportedOperationException("${entity.fullyQualifiedName}.${operation.signature} Not implemented!"); +#end + } +#end + +#end +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-model/src/templates/hibernate/MetaInfServiceFile.vsl =================================================================== --- trunk/openuss/foundation/foundation-model/src/templates/hibernate/MetaInfServiceFile.vsl (rev 0) +++ trunk/openuss/foundation/foundation-model/src/templates/hibernate/MetaInfServiceFile.vsl 2006-05-21 09:54:16 UTC (rev 40) @@ -0,0 +1,9 @@ +##------------------------------------------------------------------ +## +## Factory implementation of Business Delegate for the entity beans +## +## Author: Ingo D\xFCppe +## +##------------------------------------------------------------------ +#set ($generatedFile = "META-INF/services/${class.packageName}.${class.name}.Factory") +${class.packageName}.${class.name}Base$Factory \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-21 09:51:16
|
Revision: 39 Author: idueppe Date: 2006-05-21 02:50:54 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=39&view=rev Log Message: ----------- added independent factory utility classes Added Paths: ----------- trunk/openuss/framework/ trunk/openuss/framework/build.xml trunk/openuss/framework/pom.xml trunk/openuss/framework/utilities/ trunk/openuss/framework/utilities/.classpath trunk/openuss/framework/utilities/.project trunk/openuss/framework/utilities/.settings/ trunk/openuss/framework/utilities/.settings/org.eclipse.jdt.core.prefs trunk/openuss/framework/utilities/build.xml trunk/openuss/framework/utilities/pom.xml trunk/openuss/framework/utilities/src/ trunk/openuss/framework/utilities/src/main/ trunk/openuss/framework/utilities/src/main/java/ trunk/openuss/framework/utilities/src/main/java/org/ trunk/openuss/framework/utilities/src/main/java/org/openuss/ trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/ trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/ trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/FactoryFinder.java trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/SecuritySupport.java Added: trunk/openuss/framework/build.xml =================================================================== --- trunk/openuss/framework/build.xml (rev 0) +++ trunk/openuss/framework/build.xml 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,24 @@ +<project name="openuss :: framework :: build" default="install" basedir="."> + <target name="compile"> + <exec executable="mvn.bat"> + <arg line="compile"/> + </exec> + </target> + <target name="install"> + <exec executable="mvn.bat"> + <arg line="-e install"/> + </exec> + </target> + <target name="clean"> + <exec executable="mvn.bat"> + <arg line="clean"/> + </exec> + </target> + <target name="eclipse"> + <exec executable="mvn.bat"> + <arg line="eclipse:eclipse"/> + </exec> + </target> + + +</project> Added: trunk/openuss/framework/pom.xml =================================================================== --- trunk/openuss/framework/pom.xml (rev 0) +++ trunk/openuss/framework/pom.xml 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.openuss</groupId> + <artifactId>openuss</artifactId> + <version>3.0-SNAPSHOT</version> + </parent> + <groupId>org.openuss.framework</groupId> + <artifactId>openuss-framework</artifactId> + <name>OpenUSS - Framework</name> + <packaging>pom</packaging> + <url>http://openuss.sf.net</url> + + <organization> + <name>openuss</name> + <url>http://openuss.sourceforge.net</url> + </organization> + + <build> + <plugins> + <plugin> + <groupId>org.andromda.maven.plugins</groupId> + <artifactId>andromda-multi-source-plugin</artifactId> + </plugin> + </plugins> + <resources> + <resource> + <directory>target/src</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + + <modules> + <module>utilities</module> + </modules> + +</project> Property changes on: trunk/openuss/framework/utilities ___________________________________________________________________ Name: svn:ignore + target Added: trunk/openuss/framework/utilities/.classpath =================================================================== --- trunk/openuss/framework/utilities/.classpath (rev 0) +++ trunk/openuss/framework/utilities/.classpath 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,6 @@ +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> +</classpath> \ No newline at end of file Added: trunk/openuss/framework/utilities/.project =================================================================== --- trunk/openuss/framework/utilities/.project (rev 0) +++ trunk/openuss/framework/utilities/.project 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,14 @@ +<projectDescription> + <name>framework-utilities</name> + <comment/> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments/> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Added: trunk/openuss/framework/utilities/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/openuss/framework/utilities/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/openuss/framework/utilities/.settings/org.eclipse.jdt.core.prefs 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,5 @@ +#Sun May 21 00:08:39 CEST 2006 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 Added: trunk/openuss/framework/utilities/build.xml =================================================================== --- trunk/openuss/framework/utilities/build.xml (rev 0) +++ trunk/openuss/framework/utilities/build.xml 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,17 @@ +<project name="openuss :: framework :: utilities :: build" default="install" basedir="."> + <target name="compile"> + <exec executable="mvn.bat"> + <arg line="install"/> + </exec> + </target> + <target name="clean"> + <exec executable="mvn.bat"> + <arg line="clean"/> + </exec> + </target> + <target name="install"> + <exec executable="mvn.bat"> + <arg line="install"/> + </exec> + </target> +</project> \ No newline at end of file Added: trunk/openuss/framework/utilities/pom.xml =================================================================== --- trunk/openuss/framework/utilities/pom.xml (rev 0) +++ trunk/openuss/framework/utilities/pom.xml 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.openuss.framework</groupId> + <artifactId>openuss-framework</artifactId> + <version>3.0-SNAPSHOT</version> + </parent> + <groupId>org.openuss.framework</groupId> + <artifactId>framework-utilities</artifactId> + <name>OpenUSS - Framework - Utilities</name> + <packaging>jar</packaging> + + +</project> Added: trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/FactoryFinder.java =================================================================== --- trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/FactoryFinder.java (rev 0) +++ trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/FactoryFinder.java 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,135 @@ +/** + * Title: OpenUSS - Open University Support System + * Description: Utility Class to find factories + * Copyright: Copyright (c) Ingo D\xFCppe + * Company: University of Muenster + */ +package org.openuss.framework.utilities; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; + +/** + * @author Ingo D\xFCppe + * @version 1.0 - 25.11.2004 + */ +public class FactoryFinder { + private static SecuritySupport securitySupport = new SecuritySupport(); + + /** + * Obtain a instance of the <code>Factory</code> defined by the factoryId. + * This static method creates a new factory instance + * + * This method uses the following ordered lookup procedure to determine the + * factory implementation class to load: + * <ul> + * <li>Use the <strong>factoryId </strong> system property.</li> + * <li>Use the Services API (as detailed in the JAR specification), if + * available, to determine the classname. The Services API will look for a + * classname in the file + * <code>META-INF/services/<strong>factoryId</strong></code> in jars + * available to the runtime.</li> + * </ul> + * + * @param factoryId + * @return instance of a factory implementation + * @throws ConfigurationError + * if no implementation could be found + */ + public static Object find(String factoryId) throws ConfigurationError { + // Figure out which ClassLoader to use for loading the provider class. + // If there is a Context ClassLoad then use it. + ClassLoader classLoader = securitySupport.getContextClassLoader(); + + if (classLoader == null) { + // if no Context ClassLoader then une current class loader. + classLoader = FactoryFinder.class.getClassLoader(); + } + + // lookup system properties for factoryId + try { + String factoryClassName = securitySupport.getSystemProperty(factoryId); + + if (factoryClassName != null) { + return newInstance(factoryClassName, classLoader); + } + } catch (SecurityException sr) { + // first option fails due to any reason try next option. + } + + // lookup jar service provider mechanism + String serviceId = "META-INF/services/" + factoryId; + InputStream is = null; + is = securitySupport.getResourceAsStream(classLoader, serviceId); + if (is != null) { + BufferedReader rd; + + try { + rd = new BufferedReader(new InputStreamReader(is, "UTF-8")); + } catch (UnsupportedEncodingException e) { + rd = new BufferedReader(new InputStreamReader(is)); + } + + String factoryClassName = null; + + try { + factoryClassName = rd.readLine(); + rd.close(); + } catch (Exception e) { + // No provider found; + } + + if ((factoryClassName != null) && !"".equals(factoryClassName)) { + return newInstance(factoryClassName, classLoader); + } + } + throw new ConfigurationError("Couldn't find implementation for " + factoryId); + } + + /** + * @param factoryClassName + * @param classLoader + * @return Instance of the factory implementation. + */ + private static Object newInstance(String factoryClassName, ClassLoader classLoader) throws ConfigurationError { + try { + Class provider; + + if (classLoader == null) { + provider = Class.forName(factoryClassName); + } else { + provider = classLoader.loadClass(factoryClassName); + } + + return provider.newInstance(); + } catch (ClassNotFoundException ex) { + throw new ConfigurationError("Provider " + factoryClassName + " not found.", ex); + } catch (Exception ex) { + throw new ConfigurationError("Provider " + factoryClassName + " could not be instantiated.", ex); + } + } + + static public class ConfigurationError extends Error { + private static final long serialVersionUID = 1L; + private Exception exception; + + /** + * Construct a new instance with the specified detail string and + * exception. + */ + ConfigurationError(String msg, Exception x) { + super(msg); + this.exception = x; + } + + ConfigurationError(String msg) { + super(msg); + } + + Exception getException() { + return exception; + } + } +} \ No newline at end of file Added: trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/SecuritySupport.java =================================================================== --- trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/SecuritySupport.java (rev 0) +++ trunk/openuss/framework/utilities/src/main/java/org/openuss/framework/utilities/SecuritySupport.java 2006-05-21 09:50:54 UTC (rev 39) @@ -0,0 +1,75 @@ +/** + * Title: OpenUSS - Open University Support System + * Description: Utility Class to find factories + * Copyright: Copyright (c) Ingo D\xFCppe + * Company: University of Muenster + */ +package org.openuss.framework.utilities; + +import java.io.InputStream; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * @author Ingo D\xFCppe + * @version 1.0 - 25.11.2004 + */ +/*package*/ class SecuritySupport { + /** + * + * @return Context ClassLoader of current Thread + */ + @SuppressWarnings("unchecked") + ClassLoader getContextClassLoader() { + return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + ClassLoader cl = null; + + try { + cl = Thread.currentThread().getContextClassLoader(); + } catch (SecurityException ex) { + ex.printStackTrace(); + } + + return cl; + } + }); + } + + /** + * @param factoryId + * @return Value of the system property + */ + @SuppressWarnings("unchecked") + public String getSystemProperty(final String propertyName) { + return (String) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + return System.getProperty(propertyName); + } + }); + } + + /** + * @param classLoader + * @param serviceId + * @return + */ + @SuppressWarnings("unchecked") + public InputStream getResourceAsStream(final ClassLoader classLoader, + final String serviceId) { + return (InputStream) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + InputStream is; + + if (classLoader == null) { + is = ClassLoader.getSystemResourceAsStream(serviceId); + } else { + is = classLoader.getResourceAsStream(serviceId); + } + + return is; + } + }); + } +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:35:53
|
Revision: 38 Author: idueppe Date: 2006-05-19 09:35:47 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=38&view=rev Log Message: ----------- Modified Paths: -------------- trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml Modified: trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-19 16:30:04 UTC (rev 37) +++ trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-19 16:35:47 UTC (rev 38) @@ -45,7 +45,7 @@ <namespace name="spring"> <properties> - <property name="mergeMappingsUri">file:${config.dir}/mappings/CoreMergeMappings.xml</property> + <property name="mergeMappingsUri">file:${config.dir}/mappings/TestMergeMappings.xml</property> <property name="tests">${core.tests.generated.dir}</property> <property name="test-impls">${core.tests.manual.dir}</property> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:30:15
|
Revision: 37 Author: idueppe Date: 2006-05-19 09:30:04 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=37&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml Modified: trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml 2006-05-19 16:28:36 UTC (rev 36) +++ trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml 2006-05-19 16:30:04 UTC (rev 37) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> -<mappings name="TestMerge"> +<mappings name="CoreMerge"> <mapping> <from><![CDATA[license-header java merge-point]]></from> <to><![CDATA[OpenUSS - Open Source University Support System]]></to> @@ -18,6 +18,9 @@ <property name="tests"> <documentation>Folder for test classes</documentation> </property> + <property name="test-impls"> + <documentation>Folder for test-impl classes</documentation> + </property> </propertyGroup> ]]> </to> @@ -30,6 +33,18 @@ <template path="templates/spring/hibernate/SpringHibernateDaoTest.vsl" outputPattern="$generatedFile" + outlet="test-impls" + overwrite="false"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.spring.metafacades.SpringEntity"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/spring/hibernate/SpringHibernateDaoTestBase.vsl" + outputPattern="$generatedFile" outlet="tests" overwrite="true"> <modelElements variable="entity"> @@ -42,6 +57,13 @@ </to> </mapping> - + <mapping> + <from><![CDATA[<!-- applicationContext hibernateProperties merge-point -->]]></from> + <to><![CDATA[ + <prop key="hibernate.format_sql">true</prop> + <prop key="hibernate.transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</prop> + <prop key="hibernate.current_session_context_class">thread</prop> + ]]></to> + </mapping> </mappings> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:28:44
|
Revision: 36 Author: idueppe Date: 2006-05-19 09:28:36 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=36&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml Modified: trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml 2006-05-19 16:22:07 UTC (rev 35) +++ trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml 2006-05-19 16:28:36 UTC (rev 36) @@ -5,4 +5,10 @@ <from><![CDATA[license-header java merge-point]]></from> <to><![CDATA[OpenUSS - Open Source University Support System]]></to> </mapping> + <mapping> + <from><![CDATA[<!-- applicationContext hibernateProperties merge-point -->]]></from> + <to><![CDATA[ + <prop key="hibernate.current_session_context_class">jta</prop> + ]]></to> + </mapping> </mappings> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:22:19
|
Revision: 35 Author: idueppe Date: 2006-05-19 09:22:07 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=35&view=rev Log Message: ----------- added multiplicities to entity attributes Modified Paths: -------------- trunk/openuss/foundation/foundation-model/build.xml trunk/openuss/foundation/foundation-model/pom.xml trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml Modified: trunk/openuss/foundation/foundation-model/build.xml =================================================================== --- trunk/openuss/foundation/foundation-model/build.xml 2006-05-19 16:21:38 UTC (rev 34) +++ trunk/openuss/foundation/foundation-model/build.xml 2006-05-19 16:22:07 UTC (rev 35) @@ -1,7 +1,7 @@ <project name="openuss :: foundation :: model :: build" default="generate-sources" basedir="."> <target name="generate-sources"> <exec executable="mvn.bat"> - <arg line="-o generate-sources"/> + <arg line="-o clean generate-sources"/> </exec> </target> <target name="compile"> Modified: trunk/openuss/foundation/foundation-model/pom.xml =================================================================== --- trunk/openuss/foundation/foundation-model/pom.xml 2006-05-19 16:21:38 UTC (rev 34) +++ trunk/openuss/foundation/foundation-model/pom.xml 2006-05-19 16:22:07 UTC (rev 35) @@ -98,6 +98,10 @@ <core.tests.manual.dir> ${pom.basedir}/../foundation-core/src/test/java </core.tests.manual.dir> + <!-- @TODO: Need to be separated --> + <core.tests.generated.dir> + ${pom.basedir}/../foundation-core/src/test/java + </core.tests.generated.dir> <web.generated.dir> ${pom.basedir}/../foundation-web/target/src </web.generated.dir> Modified: trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-19 16:21:38 UTC (rev 34) +++ trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-19 16:22:07 UTC (rev 35) @@ -38,20 +38,25 @@ <property name="foreignKeySuffix">_FK</property> <property name="hibernateVersion">3</property> - <property name="hibernateCacheProvider">org.hibernate.cache.OSCacheProvider</property> - <property name="hibernateQueryCacheFactory">org.hibernate.cache.StandardQueryCacheFactory</property> + <property name="hibernateCacheProvider">org.hibernate.cache.EhCacheProvider</property> + </properties> </namespace> <namespace name="spring"> <properties> + <property name="mergeMappingsUri">file:${config.dir}/mappings/CoreMergeMappings.xml</property> + + <property name="tests">${core.tests.generated.dir}</property> + <property name="test-impls">${core.tests.manual.dir}</property> + <!-- Spring Datasource Configuration --> <property name="dataSource">java:comp/env/jdbc/openuss</property> <property name="username">sysdba</property> <property name="password">masterkey</property> <property name="driver">org.firebirdsql.jdbc.FBDriver</property> - <property name="connectionUrl">jdbc:firebirdsql:localhost:openuss-revo</property> + <property name="connectionUrl">jdbc:firebirdsql:localhost:openuss30</property> <!-- Spring Outlets Configuration --> @@ -71,15 +76,13 @@ <!-- Spring Configuration for proper support of hibernate 3.x --> <property name="sessionFactory">org.springframework.orm.hibernate3.LocalSessionFactoryBean</property> + <property name="localTransactionManager">org.springframework.orm.hibernate3.HibernateTransactionManager</property> <property name="transactionManager">org.springframework.orm.hibernate3.HibernateTransactionManager</property> <!-- Spring Security Configuration --> - <property name="acegiServiceSecurity">true</property> +<!-- <property name="acegiServiceSecurity">false</property>--> - <property name="mergeMappingsUri">file:${config.dir}/mappings/TestMergeMappings.xml</property> - - <property name="tests">${core.tests.manual.dir}</property> </properties> </namespace> @@ -95,19 +98,19 @@ </properties> </namespace> - <namespace name="jsf"> - <properties> - <property name="applicationName">openuss</property> - <property name="configuration">${web.generated.dir}</property> - <property name="controllers">${web.generated.dir}</property> - <property name="controller-impls">${web.manual.java.dir}</property> - <property name="managed-beans">${web.generated.dir}</property> - <property name="messages">${web.generated.dir}</property> - <property name="views">${web.generated.dir}</property> - <property name="forms">${web.generated.dir}</property> - <property name="enableFaceletsDevelopmentSupport">true</property> - </properties> - </namespace> +<!-- <namespace name="jsf">--> +<!-- <properties>--> +<!-- <property name="applicationName">openuss</property>--> +<!-- <property name="configuration">${web.generated.dir}</property>--> +<!-- <property name="controllers">${web.generated.dir}</property>--> +<!-- <property name="controller-impls">${web.manual.java.dir}</property>--> +<!-- <property name="managed-beans">${web.generated.dir}</property>--> +<!-- <property name="messages">${web.generated.dir}</property>--> +<!-- <property name="views">${web.generated.dir}</property>--> +<!-- <property name="forms">${web.generated.dir}</property>--> +<!-- <property name="enableFaceletsDevelopmentSupport">true</property>--> +<!-- </properties>--> +<!-- </namespace>--> <namespace name="java"> <properties> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:21:48
|
Revision: 34 Author: idueppe Date: 2006-05-19 09:21:38 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=34&view=rev Log Message: ----------- added multiplicities to entity attributes Modified Paths: -------------- trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip Property Changed: ---------------- trunk/openuss/foundation/foundation-model/src/main/uml/ Property changes on: trunk/openuss/foundation/foundation-model/src/main/uml ___________________________________________________________________ Name: svn:ignore + foundation.mdr Modified: trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:21:05
|
Revision: 33 Author: idueppe Date: 2006-05-19 09:20:53 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=33&view=rev Log Message: ----------- extend test generator Modified Paths: -------------- trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl Added Paths: ----------- trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTestBase.vsl Modified: trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl =================================================================== --- trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl 2006-05-19 16:20:30 UTC (rev 32) +++ trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl 2006-05-19 16:20:53 UTC (rev 33) @@ -14,36 +14,28 @@ package $entity.packageName; #end -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; - #set($varDao = "${stringUtils.uncapitalize($entity.daoName)}") +#set($varEntity = "${stringUtils.uncapitalize($entity.name)}") /** * JUnit Test for Spring Hibernate ${entity.daoName} class. * @see ${entity.packageName}.${entity.daoName} */ -public class ${testClassName} extends AbstractTransactionalDataSourceSpringContextTests { +public class ${testClassName} extends ${testClassName}Base { - private ${entity.daoName} $varDao; - - public ${entity.daoName} get${entity.daoName}() { - return $varDao; + public void test${entity.daoName}Create() { + ${entity.name} ${varEntity} = new ${entity.name}Impl(); +#foreach($attribute in $entity.attributes) +#if (!$attribute.identifier && !$attribute.transient && $attribute.required) + ${varEntity}.set${stringUtils.capitalize($attribute.name)}(" "); +#end +#end +#foreach($identifier in ${entity.identifiers}) + assertNull(${varEntity}.get${stringUtils.capitalize($identifier.name)}()); +#end + ${varDao}.create(${varEntity}); +#foreach($identifier in ${entity.identifiers}) + assertNotNull(${varEntity}.get${stringUtils.capitalize($identifier.name)}()); +#end } - - public void set${entity.daoName}(${entity.daoName} ${varDao}) { - this.$varDao = $varDao; - } - - public void test${entity.daoName}Injection() { - assertNotNull($varDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } - } \ No newline at end of file Added: trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTestBase.vsl =================================================================== --- trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTestBase.vsl (rev 0) +++ trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTestBase.vsl 2006-05-19 16:20:53 UTC (rev 33) @@ -0,0 +1,52 @@ +#set($testClassName = "${entity.daoName}TestBase") +#set ($generatedFile = "${entity.packagePath}/${testClassName}.java") +#if ($enableTemplating) +#set ($entityCollectionType = "java.util.Collection<${entity.fullyQualifiedEntityName}>") +#else +#set ($entityCollectionType = "java.util.Collection") +#end +// license-header java merge-point +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +#if ($stringUtils.isNotBlank($entity.packageName)) +package $entity.packageName; +#end + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; +import org.apache.log4j.Logger; + +#set($varDao = "${stringUtils.uncapitalize($entity.daoName)}") +#set($varEntity = "${stringUtils.uncapitalize($entity.name)}") + +/** + * JUnit Test for Spring Hibernate ${entity.daoName} class. + * @see ${entity.packageName}.${entity.daoName} + */ +public abstract class ${testClassName} extends AbstractTransactionalDataSourceSpringContextTests { + + protected static final Logger logger = Logger.getLogger(${entity.daoName}Test.class); + + protected ${entity.daoName} $varDao; + + public ${entity.daoName} get${entity.daoName}() { + return $varDao; + } + + public void set${entity.daoName}(${entity.daoName} ${varDao}) { + this.$varDao = $varDao; + } + + public void test${entity.daoName}Injection() { + assertNotNull($varDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:20:39
|
Revision: 32 Author: idueppe Date: 2006-05-19 09:20:30 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=32&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/build.xml trunk/openuss/pom.xml Added Paths: ----------- trunk/openuss/readme.txt Modified: trunk/openuss/build.xml =================================================================== --- trunk/openuss/build.xml 2006-05-19 16:18:06 UTC (rev 31) +++ trunk/openuss/build.xml 2006-05-19 16:20:30 UTC (rev 32) @@ -6,13 +6,18 @@ </target> <target name="install"> <exec executable="mvn.bat"> - <arg line="-o install"/> + <arg line="-e install"/> </exec> </target> - <target name="clean"> + <target name="clean-all"> <exec executable="mvn.bat"> <arg line="-o clean"/> </exec> + <delete verbose="true" includeemptydirs="true"> + <fileset dir="."> + <include name="**/andromda*.log"/> + </fileset> + </delete> </target> <target name="site"> <exec executable="mvn.bat"> Modified: trunk/openuss/pom.xml =================================================================== --- trunk/openuss/pom.xml 2006-05-19 16:18:06 UTC (rev 31) +++ trunk/openuss/pom.xml 2006-05-19 16:20:30 UTC (rev 32) @@ -63,7 +63,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> - <version>[3.1.2,)</version> + <version>[3.1.3,)</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -90,22 +90,26 @@ <dependency> <groupId>jaybird</groupId> <artifactId>jaybird-full</artifactId> - <scope>test</scope> <version>[2.0.1,)</version> </dependency> + <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <scope>test</scope> - <version>2.1.1</version> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.2</version> </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-mock</artifactId> - <scope>test</scope> - <version>2.0-m1</version> + <version>[2.0-m1,)</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>[1.2.9,)</version> + </dependency> <!-- AndroMDA Dependencies --> <dependency> @@ -354,16 +358,6 @@ <name>apache</name> <url>http://cvs.apache.org/repository</url> </repository> - <repository> - <id>Maven Snapshots</id> - <url>http://snapshots.maven.codehaus.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> </repositories> <pluginRepositories> <pluginRepository> @@ -371,16 +365,6 @@ <name>AndroMDA Repository</name> <url>http://team.andromda.org/maven2</url> </pluginRepository> - <pluginRepository> - <id>Maven Snapshots</id> - <url>http://snapshots.maven.codehaus.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> </pluginRepositories> <prerequisites> <maven>2.0.1</maven> Added: trunk/openuss/readme.txt =================================================================== --- trunk/openuss/readme.txt (rev 0) +++ trunk/openuss/readme.txt 2006-05-19 16:20:30 UTC (rev 32) @@ -0,0 +1,6 @@ +OpenUSS - Open University Support System +========================================= + +The source code can be build with maven 2.0. + +@TODO Describe how to build and setup the development environment. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:18:31
|
Revision: 31 Author: idueppe Date: 2006-05-19 09:18:06 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=31&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/foundation/foundation-core/.classpath trunk/openuss/foundation/foundation-core/pom.xml trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyServiceImpl.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties Added Paths: ----------- trunk/openuss/foundation/foundation-core/.springBeans trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/AllTests.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java Modified: trunk/openuss/foundation/foundation-core/.classpath =================================================================== --- trunk/openuss/foundation/foundation-core/.classpath 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/.classpath 2006-05-19 16:18:06 UTC (rev 31) @@ -5,23 +5,24 @@ <classpathentry kind="src" path="target/src"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/opensymphony/oscache/2.1.1/oscache-2.1.1.jar" sourcepath="M2_REPO/opensymphony/oscache/2.1.1/oscache-2.1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar" sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar" sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m4/spring-mock-2.0-m4.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar" sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar" sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar"/> <classpathentry kind="src" path="/foundation-api"/> - <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar" sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar" sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4.jar" sourcepath="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar" sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar" sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m1/spring-mock-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-mock/2.0-m1/spring-mock-2.0-m1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/> </classpath> \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/.springBeans =================================================================== --- trunk/openuss/foundation/foundation-core/.springBeans (rev 0) +++ trunk/openuss/foundation/foundation-core/.springBeans 2006-05-19 16:18:06 UTC (rev 31) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beansProjectDescription> + <configExtensions> + <configExtension>xml</configExtension> + </configExtensions> + <configs> + <config>target/src/beanRefFactory.xml</config> + <config>target/src/applicationContext-dataSource.xml</config> + <config>target/src/applicationContext-localDataSource.xml</config> + <config>target/src/applicationContext.xml</config> + </configs> + <configSets> + </configSets> +</beansProjectDescription> Modified: trunk/openuss/foundation/foundation-core/pom.xml =================================================================== --- trunk/openuss/foundation/foundation-core/pom.xml 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/pom.xml 2006-05-19 16:18:06 UTC (rev 31) @@ -62,13 +62,17 @@ </dependency> <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> + <dependency> <groupId>jaybird</groupId> <artifactId>jaybird-full</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> <scope>test</scope> </dependency> <dependency> Modified: trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyServiceImpl.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyServiceImpl.java 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/src/main/java/org/openuss/foundation/lecture/FacultyServiceImpl.java 2006-05-19 16:18:06 UTC (rev 31) @@ -1,4 +1,4 @@ -// license-header java merge-point +// OpenUSS - Open Source University Support System /** * This is only generated once! It will never be overwritten. * You can (and have to!) safely modify it by hand. @@ -22,14 +22,4 @@ throw new java.lang.UnsupportedOperationException("org.openuss.foundation.lecture.FacultyService.handleCreateFaculty(org.openuss.foundation.lecture.Faculty faculty) Not implemented!"); } - /** - * @see org.openuss.foundation.lecture.FacultyService#getAllFaculties() - */ - protected java.util.List handleGetAllFaculties() - throws java.lang.Exception - { - // @todo implement protected java.util.List handleGetAllFaculties() - return null; - } - } \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/AllTests.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/AllTests.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/AllTests.java 2006-05-19 16:18:06 UTC (rev 31) @@ -0,0 +1,23 @@ +package org.openuss.foundation.lecture; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllTests { + + public static Test suite() { + TestSuite suite = new TestSuite("Test for org.openuss.foundation.lecture"); + // $JUnit-BEGIN$ + suite.addTestSuite(EnrollmentDaoTest.class); + suite.addTestSuite(SubjectDaoTest.class); + suite.addTestSuite(FacultyDaoTest.class); + suite.addTestSuite(PeriodDaoTest.class); + // $JUnit-END$ + return suite; + } + + public static void main(String[] args) { + suite(); + } + +} Modified: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java 2006-05-19 16:18:06 UTC (rev 31) @@ -5,35 +5,19 @@ */ package org.openuss.foundation.lecture; -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; - /** * JUnit Test for Spring Hibernate EnrollmentDao class. * @see org.openuss.foundation.lecture.EnrollmentDao */ -public class EnrollmentDaoTest extends AbstractTransactionalDataSourceSpringContextTests { +public class EnrollmentDaoTest extends EnrollmentDaoTestBase { - private EnrollmentDao enrollmentDao; - - public EnrollmentDao getEnrollmentDao() { - return enrollmentDao; + public void testEnrollmentDaoCreate() { + Faculty faculty = new FacultyImpl(); + Enrollment enrollment = new EnrollmentImpl(); + enrollment.setFaculty(faculty); + assertNull(enrollment.getId()); + enrollmentDao.create(enrollment); + assertNotNull(enrollment.getId()); } - - public void setEnrollmentDao(EnrollmentDao enrollmentDao) { - this.enrollmentDao = enrollmentDao; - } - - public void testEnrollmentDaoInjection() { - assertNotNull(enrollmentDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } - } \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTestBase.java 2006-05-19 16:18:06 UTC (rev 31) @@ -0,0 +1,41 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; +import org.apache.log4j.Logger; + + +/** + * JUnit Test for Spring Hibernate EnrollmentDao class. + * @see org.openuss.foundation.lecture.EnrollmentDao + */ +public abstract class EnrollmentDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { + + protected static final Logger logger = Logger.getLogger(EnrollmentDaoTest.class); + + protected EnrollmentDao enrollmentDao; + + public EnrollmentDao getEnrollmentDao() { + return enrollmentDao; + } + + public void setEnrollmentDao(EnrollmentDao enrollmentDao) { + this.enrollmentDao = enrollmentDao; + } + + public void testEnrollmentDaoInjection() { + assertNotNull(enrollmentDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } +} \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java 2006-05-19 16:18:06 UTC (rev 31) @@ -5,35 +5,40 @@ */ package org.openuss.foundation.lecture; -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; - /** * JUnit Test for Spring Hibernate FacultyDao class. * @see org.openuss.foundation.lecture.FacultyDao */ -public class FacultyDaoTest extends AbstractTransactionalDataSourceSpringContextTests { +public class FacultyDaoTest extends FacultyDaoTestBase { - private FacultyDao facultyDao; + public void testFacultyDaoCreate() { + Faculty faculty = createTestFaculty(); + assertNull(faculty.getId()); + facultyDao.create(faculty); + assertNotNull(faculty.getId()); + } - public FacultyDao getFacultyDao() { - return facultyDao; + public void testUniqueShortcut() { + Faculty faculty = createTestFaculty(); + + assertNull(faculty.getId()); + facultyDao.create(faculty); + assertNotNull(faculty.getId()); + + Faculty faculty2 = createTestFaculty(); + assertNull(faculty2.getId()); + facultyDao.create(faculty2); + assertNotNull(faculty2.getId()); + } - public void setFacultyDao(FacultyDao facultyDao) { - this.facultyDao = facultyDao; + private Faculty createTestFaculty() { + Faculty faculty = new FacultyImpl(); + faculty.setName("name"); + faculty.setShortcut("shortcut"); + faculty.setOwner("owner"); + return faculty; } - - public void testFacultyDaoInjection() { - assertNotNull(facultyDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } - + } \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTestBase.java 2006-05-19 16:18:06 UTC (rev 31) @@ -0,0 +1,41 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; +import org.apache.log4j.Logger; + + +/** + * JUnit Test for Spring Hibernate FacultyDao class. + * @see org.openuss.foundation.lecture.FacultyDao + */ +public abstract class FacultyDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { + + protected static final Logger logger = Logger.getLogger(FacultyDaoTest.class); + + protected FacultyDao facultyDao; + + public FacultyDao getFacultyDao() { + return facultyDao; + } + + public void setFacultyDao(FacultyDao facultyDao) { + this.facultyDao = facultyDao; + } + + public void testFacultyDaoInjection() { + assertNotNull(facultyDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } +} \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java 2006-05-19 16:18:06 UTC (rev 31) @@ -5,35 +5,18 @@ */ package org.openuss.foundation.lecture; -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; - /** * JUnit Test for Spring Hibernate PeriodDao class. * @see org.openuss.foundation.lecture.PeriodDao */ -public class PeriodDaoTest extends AbstractTransactionalDataSourceSpringContextTests { +public class PeriodDaoTest extends PeriodDaoTestBase { - private PeriodDao periodDao; - - public PeriodDao getPeriodDao() { - return periodDao; + public void testPeriodDaoCreate() { + Period period = new PeriodImpl(); + period.setName(" "); + assertNull(period.getId()); + periodDao.create(period); + assertNotNull(period.getId()); } - - public void setPeriodDao(PeriodDao periodDao) { - this.periodDao = periodDao; - } - - public void testPeriodDaoInjection() { - assertNotNull(periodDao); - } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; - } - } \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTestBase.java 2006-05-19 16:18:06 UTC (rev 31) @@ -0,0 +1,41 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; +import org.apache.log4j.Logger; + + +/** + * JUnit Test for Spring Hibernate PeriodDao class. + * @see org.openuss.foundation.lecture.PeriodDao + */ +public abstract class PeriodDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { + + protected static final Logger logger = Logger.getLogger(PeriodDaoTest.class); + + protected PeriodDao periodDao; + + public PeriodDao getPeriodDao() { + return periodDao; + } + + public void setPeriodDao(PeriodDao periodDao) { + this.periodDao = periodDao; + } + + public void testPeriodDaoInjection() { + assertNotNull(periodDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } +} \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java 2006-05-19 16:18:06 UTC (rev 31) @@ -5,35 +5,43 @@ */ package org.openuss.foundation.lecture; -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; - /** * JUnit Test for Spring Hibernate SubjectDao class. * @see org.openuss.foundation.lecture.SubjectDao */ -public class SubjectDaoTest extends AbstractTransactionalDataSourceSpringContextTests { +public class SubjectDaoTest extends SubjectDaoTestBase { - private SubjectDao subjectDao; + public FacultyDao facultyDao; - public SubjectDao getSubjectDao() { - return subjectDao; + public void setFacultyDao(FacultyDao facultyDao) { + this.facultyDao = facultyDao; } - - public void setSubjectDao(SubjectDao subjectDao) { - this.subjectDao = subjectDao; + + public FacultyDao getFacultyDao() { + return facultyDao; } - - public void testSubjectDaoInjection() { - assertNotNull(subjectDao); + + public void testFacultyInjection() { + assertNotNull(facultyDao); } - - protected String[] getConfigLocations() { - return new String[] { - "classpath*:applicationContext.xml", - "classpath*:applicationContext-localDataSource.xml", - "classpath*:applicationContext-beans.xml", - "classpath*:beanRefFactory"}; + + public void testSubjectDaoCreate() { + // create your faculty + Faculty faculty = new FacultyImpl(); + faculty.setName("name"); + faculty.setShortcut("shortcut"); + faculty.setOwner("owner"); + facultyDao.create(faculty); + assertNotNull(faculty.getId()); + + // create a subject + Subject subject = new SubjectImpl(); + subject.setFaculty(faculty); + subject.setName("subject"); + subject.setShortcut("subject"); + assertNull(subject.getId()); + subjectDao.create(subject); + assertNotNull(subject.getId()); } - } \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTestBase.java 2006-05-19 16:18:06 UTC (rev 31) @@ -0,0 +1,41 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; +import org.apache.log4j.Logger; + + +/** + * JUnit Test for Spring Hibernate SubjectDao class. + * @see org.openuss.foundation.lecture.SubjectDao + */ +public abstract class SubjectDaoTestBase extends AbstractTransactionalDataSourceSpringContextTests { + + protected static final Logger logger = Logger.getLogger(SubjectDaoTest.class); + + protected SubjectDao subjectDao; + + public SubjectDao getSubjectDao() { + return subjectDao; + } + + public void setSubjectDao(SubjectDao subjectDao) { + this.subjectDao = subjectDao; + } + + public void testSubjectDaoInjection() { + assertNotNull(subjectDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } +} \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties 2006-05-19 16:17:10 UTC (rev 30) +++ trunk/openuss/foundation/foundation-core/src/test/resources/log4j.properties 2006-05-19 16:18:06 UTC (rev 31) @@ -6,6 +6,8 @@ log4j.logger.org.springframework=INFO log4j.logger.org.hibernate=INFO +log4j.logger.org.openuss=DEBUG + # Configure logging for testing: optionally with log file # log4j.rootLogger=DEBUG, stdout # log4j.rootLogger=WARN, stdout, logfile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-19 16:17:24
|
Revision: 30 Author: idueppe Date: 2006-05-19 09:17:10 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=30&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/foundation/foundation-api/.classpath Modified: trunk/openuss/foundation/foundation-api/.classpath =================================================================== --- trunk/openuss/foundation/foundation-api/.classpath 2006-05-18 18:33:47 UTC (rev 29) +++ trunk/openuss/foundation/foundation-api/.classpath 2006-05-19 16:17:10 UTC (rev 30) @@ -2,7 +2,7 @@ <classpathentry kind="src" path="target/src"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-sources.jar"/> </classpath> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-18 18:34:00
|
Revision: 29 Author: idueppe Date: 2006-05-18 11:33:47 -0700 (Thu, 18 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=29&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/foundation/foundation-core/.classpath trunk/openuss/foundation/foundation-core/.project Added Paths: ----------- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java Modified: trunk/openuss/foundation/foundation-core/.classpath =================================================================== --- trunk/openuss/foundation/foundation-core/.classpath 2006-05-18 18:31:22 UTC (rev 28) +++ trunk/openuss/foundation/foundation-core/.classpath 2006-05-18 18:33:47 UTC (rev 29) @@ -5,23 +5,23 @@ <classpathentry kind="src" path="target/src"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/opensymphony/oscache/2.1.1/oscache-2.1.1.jar" sourcepath="M2_REPO/opensymphony/oscache/2.1.1/oscache-2.1.1-sources.jar"/> + <classpathentry kind="src" path="/foundation-api"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar" sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar" sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4.jar" sourcepath="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar" sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar" sourcepath="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar" sourcepath="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4.jar" sourcepath="M2_REPO/org/springframework/spring/2.0-m4/spring-2.0-m4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar" sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-hibernate3/2.0-m1/spring-hibernate3-2.0-m1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/opensymphony/oscache/2.1.1/oscache-2.1.1.jar" sourcepath="M2_REPO/opensymphony/oscache/2.1.1/oscache-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m1/spring-mock-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-mock/2.0-m1/spring-mock-2.0-m1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar" sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1.jar" sourcepath="M2_REPO/jaybird/jaybird-full/2.0.1/jaybird-full-2.0.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/openuss/foundation/foundation-api/3.0-SNAPSHOT/foundation-api-3.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/openuss/foundation/foundation-api/3.0-SNAPSHOT/foundation-api-3.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.1.3/hibernate-3.1.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-m1/spring-mock-2.0-m1.jar" sourcepath="M2_REPO/org/springframework/spring-mock/2.0-m1/spring-mock-2.0-m1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/> </classpath> \ No newline at end of file Modified: trunk/openuss/foundation/foundation-core/.project =================================================================== --- trunk/openuss/foundation/foundation-core/.project 2006-05-18 18:31:22 UTC (rev 28) +++ trunk/openuss/foundation/foundation-core/.project 2006-05-18 18:33:47 UTC (rev 29) @@ -1,7 +1,9 @@ <projectDescription> <name>foundation-core</name> <comment/> - <projects/> + <projects> + <project>foundation-api</project> + </projects> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/EnrollmentDaoTest.java 2006-05-18 18:33:47 UTC (rev 29) @@ -0,0 +1,39 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; + + +/** + * JUnit Test for Spring Hibernate EnrollmentDao class. + * @see org.openuss.foundation.lecture.EnrollmentDao + */ +public class EnrollmentDaoTest extends AbstractTransactionalDataSourceSpringContextTests { + + private EnrollmentDao enrollmentDao; + + public EnrollmentDao getEnrollmentDao() { + return enrollmentDao; + } + + public void setEnrollmentDao(EnrollmentDao enrollmentDao) { + this.enrollmentDao = enrollmentDao; + } + + public void testEnrollmentDaoInjection() { + assertNotNull(enrollmentDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } + +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/FacultyDaoTest.java 2006-05-18 18:33:47 UTC (rev 29) @@ -0,0 +1,39 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; + + +/** + * JUnit Test for Spring Hibernate FacultyDao class. + * @see org.openuss.foundation.lecture.FacultyDao + */ +public class FacultyDaoTest extends AbstractTransactionalDataSourceSpringContextTests { + + private FacultyDao facultyDao; + + public FacultyDao getFacultyDao() { + return facultyDao; + } + + public void setFacultyDao(FacultyDao facultyDao) { + this.facultyDao = facultyDao; + } + + public void testFacultyDaoInjection() { + assertNotNull(facultyDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } + +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/PeriodDaoTest.java 2006-05-18 18:33:47 UTC (rev 29) @@ -0,0 +1,39 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; + + +/** + * JUnit Test for Spring Hibernate PeriodDao class. + * @see org.openuss.foundation.lecture.PeriodDao + */ +public class PeriodDaoTest extends AbstractTransactionalDataSourceSpringContextTests { + + private PeriodDao periodDao; + + public PeriodDao getPeriodDao() { + return periodDao; + } + + public void setPeriodDao(PeriodDao periodDao) { + this.periodDao = periodDao; + } + + public void testPeriodDaoInjection() { + assertNotNull(periodDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } + +} \ No newline at end of file Added: trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java =================================================================== --- trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java (rev 0) +++ trunk/openuss/foundation/foundation-core/src/test/java/org/openuss/foundation/lecture/SubjectDaoTest.java 2006-05-18 18:33:47 UTC (rev 29) @@ -0,0 +1,39 @@ +// OpenUSS - Open Source University Support System +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +package org.openuss.foundation.lecture; + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; + + +/** + * JUnit Test for Spring Hibernate SubjectDao class. + * @see org.openuss.foundation.lecture.SubjectDao + */ +public class SubjectDaoTest extends AbstractTransactionalDataSourceSpringContextTests { + + private SubjectDao subjectDao; + + public SubjectDao getSubjectDao() { + return subjectDao; + } + + public void setSubjectDao(SubjectDao subjectDao) { + this.subjectDao = subjectDao; + } + + public void testSubjectDaoInjection() { + assertNotNull(subjectDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-18 18:31:28
|
Revision: 28 Author: idueppe Date: 2006-05-18 11:31:22 -0700 (Thu, 18 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=28&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/foundation/foundation-api/.classpath Modified: trunk/openuss/foundation/foundation-api/.classpath =================================================================== --- trunk/openuss/foundation/foundation-api/.classpath 2006-05-18 17:10:57 UTC (rev 27) +++ trunk/openuss/foundation/foundation-api/.classpath 2006-05-18 18:31:22 UTC (rev 28) @@ -2,7 +2,7 @@ <classpathentry kind="src" path="target/src"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-sources.jar"/> </classpath> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-18 17:11:19
|
Revision: 27 Author: idueppe Date: 2006-05-18 10:10:57 -0700 (Thu, 18 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=27&view=rev Log Message: ----------- started to add junit test generation for spring entity daos. Modified Paths: -------------- trunk/openuss/foundation/foundation-model/build.xml trunk/openuss/foundation/foundation-model/pom.xml trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip Added Paths: ----------- trunk/openuss/foundation/foundation-model/src/main/config/mappings/ trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml trunk/openuss/foundation/foundation-model/src/templates/ trunk/openuss/foundation/foundation-model/src/templates/spring/ trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/ trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl Modified: trunk/openuss/foundation/foundation-model/build.xml =================================================================== --- trunk/openuss/foundation/foundation-model/build.xml 2006-05-15 16:35:53 UTC (rev 26) +++ trunk/openuss/foundation/foundation-model/build.xml 2006-05-18 17:10:57 UTC (rev 27) @@ -1,4 +1,9 @@ -<project name="openuss :: foundation :: model :: build" default="compile" basedir="."> +<project name="openuss :: foundation :: model :: build" default="generate-sources" basedir="."> + <target name="generate-sources"> + <exec executable="mvn.bat"> + <arg line="-o generate-sources"/> + </exec> + </target> <target name="compile"> <exec executable="mvn.bat"> <arg line="compile"/> Modified: trunk/openuss/foundation/foundation-model/pom.xml =================================================================== --- trunk/openuss/foundation/foundation-model/pom.xml 2006-05-15 16:35:53 UTC (rev 26) +++ trunk/openuss/foundation/foundation-model/pom.xml 2006-05-18 17:10:57 UTC (rev 27) @@ -84,24 +84,31 @@ <filter></filter> <validation>true</validation> <conf.dir>${pom.basedir}/src/main/config</conf.dir> + <web.application.name>openuss</web.application.name> <!-- cartridge output locations --> + <api.generated.dir> + ${pom.basedir}/../foundation-api/target/src + </api.generated.dir> <core.generated.dir> ${pom.basedir}/../foundation-core/target/src </core.generated.dir> <core.manual.dir> ${pom.basedir}/../foundation-core/src/main/java </core.manual.dir> + <core.tests.manual.dir> + ${pom.basedir}/../foundation-core/src/test/java + </core.tests.manual.dir> <web.generated.dir> ${pom.basedir}/../foundation-web/target/src </web.generated.dir> - <web.manual.java.dir> + <web.manual.dir> ${pom.basedir}/../foundation-web/src/main/java - </web.manual.java.dir> - <api.generated.dir> - ${pom.basedir}/../foundation-api/target/src - </api.generated.dir> - <web.application.name>openuss</web.application.name> - <web.generated.dir>${pom.basedir}/../foundation-web/target/src</web.generated.dir> - <web.manual.java.dir>${pom.basedir}/../foundation-web/src/main/java</web.manual.java.dir> + </web.manual.dir> + <web.generated.dir> + ${pom.basedir}/../foundation-web/target/src + </web.generated.dir> + <config.dir> + ${pom.basedir}/src/main/config + </config.dir> </properties> </project> Modified: trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-15 16:35:53 UTC (rev 26) +++ trunk/openuss/foundation/foundation-model/src/main/config/andromda.xml 2006-05-18 17:10:57 UTC (rev 27) @@ -1,6 +1,6 @@ <andromda> <properties> - <property name="modelValidation">${validation}</property> + <property name="modelValidation">true</property> <property name="cartridgeFilter">${filter}</property> </properties> @@ -17,20 +17,26 @@ <moduleSearchLocations> <location patterns="**/*.xml.zip, **/*.uml2">${settings.localRepository}/org/andromda/profiles</location> </moduleSearchLocations> + </model> - </models> + </models> </repository> </repositories> + <namespaces> <namespace name="default"> <properties> + <property name="mergeLocation">${pom.basedir}/src</property> + <property name="mergeMappingsUri">file:${config.dir}/mappings/FoundationMergeMappings.xml</property> + <property name="languageMappingsUri">Java</property> <property name="wrapperMappingsUri">JavaWrapper</property> <property name="sqlMappingsUri">Firebird</property> <property name="jdbcMappingsUri">JDBC</property> <property name="maxSqlNameLength">30</property> <property name="foreignKeySuffix">_FK</property> + <property name="hibernateVersion">3</property> <property name="hibernateCacheProvider">org.hibernate.cache.OSCacheProvider</property> <property name="hibernateQueryCacheFactory">org.hibernate.cache.StandardQueryCacheFactory</property> @@ -39,25 +45,41 @@ <namespace name="spring"> <properties> + <!-- Spring Datasource Configuration --> + <property name="dataSource">java:comp/env/jdbc/openuss</property> <property name="username">sysdba</property> <property name="password">masterkey</property> <property name="driver">org.firebirdsql.jdbc.FBDriver</property> <property name="connectionUrl">jdbc:firebirdsql:localhost:openuss-revo</property> + + <!-- Spring Outlets Configuration --> + <property name="daos">${core.generated.dir}</property> <property name="dao-impls">${core.manual.dir}</property> <property name="spring-configuration">${core.generated.dir}</property> <property name="services">${core.generated.dir}</property> <property name="service-impls">${core.manual.dir}</property> <property name="service-interfaces">${api.generated.dir}</property> + + <!-- Spring Hibernate Configuraiton --> + <property name="hibernateDialect">org.hibernate.dialect.FirebirdDialect</property> <property name="hibernateHbm2DDLAuto">create</property> <property name="hibernateShowSql">true</property> - <!-- Bugfixing of AndroMDA for properly support of Hibernate 3 --> + + <!-- Spring Configuration for proper support of hibernate 3.x --> + <property name="sessionFactory">org.springframework.orm.hibernate3.LocalSessionFactoryBean</property> <property name="localTransactionManager">org.springframework.orm.hibernate3.HibernateTransactionManager</property> <property name="transactionManager">org.springframework.orm.hibernate3.HibernateTransactionManager</property> + + <!-- Spring Security Configuration --> <property name="acegiServiceSecurity">true</property> + + <property name="mergeMappingsUri">file:${config.dir}/mappings/TestMergeMappings.xml</property> + + <property name="tests">${core.tests.manual.dir}</property> </properties> </namespace> @@ -69,6 +91,7 @@ <property name="entity-impls">${core.manual.dir}</property> <property name="entity-mappings">${core.generated.dir}</property> <property name="user-types">${core.generated.dir}</property> + </properties> </namespace> Added: trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml (rev 0) +++ trunk/openuss/foundation/foundation-model/src/main/config/mappings/FoundationMergeMappings.xml 2006-05-18 17:10:57 UTC (rev 27) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + +<mappings name="FoundationMerge"> + <mapping> + <from><![CDATA[license-header java merge-point]]></from> + <to><![CDATA[OpenUSS - Open Source University Support System]]></to> + </mapping> +</mappings> \ No newline at end of file Added: trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml =================================================================== --- trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml (rev 0) +++ trunk/openuss/foundation/foundation-model/src/main/config/mappings/TestMergeMappings.xml 2006-05-18 17:10:57 UTC (rev 27) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + +<mappings name="TestMerge"> + <mapping> + <from><![CDATA[license-header java merge-point]]></from> + <to><![CDATA[OpenUSS - Open Source University Support System]]></to> + </mapping> + + <!-- GenerateTest Merge --> + <mapping> + <from><![CDATA[<!-- namespace-propertyGroup merge-point -->]]></from> + <to> +<![CDATA[ + <propertyGroup name="CustomOutlets"> + <documentation> + Custom outlets + </documentation> + <property name="tests"> + <documentation>Folder for test classes</documentation> + </property> + </propertyGroup> +]]> + </to> + </mapping> + + <mapping> + <from><![CDATA[<!-- cartridge-template merge-point -->]]></from> + <to> +<![CDATA[ + <template + path="templates/spring/hibernate/SpringHibernateDaoTest.vsl" + outputPattern="$generatedFile" + outlet="tests" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.spring.metafacades.SpringEntity"/> + </modelElement> + </modelElements> + </template> +]]> + </to> + </mapping> + + + +</mappings> \ No newline at end of file Modified: trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip =================================================================== (Binary files differ) Added: trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl =================================================================== --- trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl (rev 0) +++ trunk/openuss/foundation/foundation-model/src/templates/spring/hibernate/SpringHibernateDaoTest.vsl 2006-05-18 17:10:57 UTC (rev 27) @@ -0,0 +1,49 @@ +#set($testClassName = "${entity.daoName}Test") +#set ($generatedFile = "${entity.packagePath}/${testClassName}.java") +#if ($enableTemplating) +#set ($entityCollectionType = "java.util.Collection<${entity.fullyQualifiedEntityName}>") +#else +#set ($entityCollectionType = "java.util.Collection") +#end +// license-header java merge-point +/** + * This is only generated once! It will never be overwritten. + * You can (and have to!) safely modify it by hand. + */ +#if ($stringUtils.isNotBlank($entity.packageName)) +package $entity.packageName; +#end + +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; + +#set($varDao = "${stringUtils.uncapitalize($entity.daoName)}") + +/** + * JUnit Test for Spring Hibernate ${entity.daoName} class. + * @see ${entity.packageName}.${entity.daoName} + */ +public class ${testClassName} extends AbstractTransactionalDataSourceSpringContextTests { + + private ${entity.daoName} $varDao; + + public ${entity.daoName} get${entity.daoName}() { + return $varDao; + } + + public void set${entity.daoName}(${entity.daoName} ${varDao}) { + this.$varDao = $varDao; + } + + public void test${entity.daoName}Injection() { + assertNotNull($varDao); + } + + protected String[] getConfigLocations() { + return new String[] { + "classpath*:applicationContext.xml", + "classpath*:applicationContext-localDataSource.xml", + "classpath*:applicationContext-beans.xml", + "classpath*:beanRefFactory"}; + } + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <id...@us...> - 2006-05-15 16:35:58
|
Revision: 26 Author: idueppe Date: 2006-05-15 09:35:53 -0700 (Mon, 15 May 2006) ViewCVS: http://svn.sourceforge.net/openuss/?rev=26&view=rev Log Message: ----------- setup openuss 3.0 trunk Modified Paths: -------------- trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip Modified: trunk/openuss/foundation/foundation-model/src/main/uml/foundation.xml.zip =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
2 messages has been excluded from this view by a project administrator.
