<?xml version="1.0" encoding="UTF-8"?>\r
<classpath>\r
<classpathentry kind="src" path="src/main/java"/>\r
+ <classpathentry kind="src" path="src/main/resources"/>\r
<classpathentry kind="src" path="src/test/java"/>\r
- <classpathentry kind="lib" path="lib/ant.jar" sourcepath="lib-src/ant-1.7.0-src.zip"/>\r
- <classpathentry kind="lib" path="lib/ant-launcher.jar" sourcepath="lib-src/ant-1.7.0-src.zip"/>\r
- <classpathentry kind="lib" path="lib/spring-2.0.6.jar" sourcepath="lib-src/spring-2.0.6-src.zip"/>\r
- <classpathentry kind="lib" path="lib/commons-logging.jar"/>\r
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>\r
- <classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/>\r
- <classpathentry kind="lib" path="lib/asm.jar"/>\r
- <classpathentry kind="lib" path="lib/asm-attrs.jar"/>\r
- <classpathentry kind="lib" path="lib/cglib-2.1.3.jar"/>\r
- <classpathentry kind="lib" path="lib/commons-collections-2.1.1.jar"/>\r
- <classpathentry kind="lib" path="lib/commons-dbcp.jar"/>\r
- <classpathentry kind="lib" path="lib/commons-lang.jar"/>\r
- <classpathentry kind="lib" path="lib/commons-pool.jar"/>\r
- <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>\r
- <classpathentry kind="lib" path="lib/hibernate3.jar"/>\r
- <classpathentry kind="lib" path="lib/hsqldb.jar"/>\r
- <classpathentry kind="lib" path="lib/jta.jar"/>\r
- <classpathentry kind="lib" path="lib/dbunit-2.2.jar" sourcepath="lib-src/dbunit-2.2-sources.jar"/>\r
- <classpathentry kind="lib" path="lib/junit-3.8.2.jar" sourcepath="lib-src/junit-3.8.2-sources.jar"/>\r
- <classpathentry kind="lib" path="lib/commons-io-1.3.2.jar" sourcepath="lib-src/commons-io-1.3.2-sources.jar"/>\r
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
+ <classpathentry kind="src" path="src/test/resources"/>\r
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="output" path="target/classes"/>\r
</classpath>\r
<projects>\r
</projects>\r
<buildSpec>\r
+ <buildCommand>\r
+ <name>org.maven.ide.eclipse.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
<buildCommand>\r
<name>org.eclipse.jdt.core.javabuilder</name>\r
<arguments>\r
</buildSpec>\r
<natures>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
-#Sun Nov 18 09:33:59 CET 2007\r
+#Sat Dec 01 11:46:50 CET 2007\r
eclipse.preferences.version=1\r
org.eclipse.jdt.core.builder.cleanOutputFolder=clean\r
org.eclipse.jdt.core.builder.duplicateResourceTask=warning\r
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <groupId>org.argeo.slc</groupId>\r
+ <artifactId>argeo-slc-core</artifactId>\r
+ <name>Argeo SLC</name>\r
+ <version>0.5.1-SNAPSHOT</version>\r
+ <description>SLC Core</description>\r
+ <scm>\r
+ <connection>\r
+ scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc\r
+ </connection>\r
+ <developerConnection>\r
+ scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc\r
+ </developerConnection>\r
+ <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>\r
+ </scm>\r
+ <issueManagement>\r
+ <system>Bugzilla</system>\r
+ <url>https://www.argeo.org/bugzilla/</url>\r
+ </issueManagement>\r
+ <licenses>\r
+ <license>\r
+ <name>Apache 2</name>\r
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>\r
+ <distribution>repo</distribution>\r
+ <comments>A business-friendly OSS license</comments>\r
+ </license>\r
+ </licenses>\r
+ <organization>\r
+ <name>Argeo</name>\r
+ <url>http://www.argeo.org</url>\r
+ </organization>\r
+ <developers>\r
+ <developer>\r
+ <id>mbaudier</id>\r
+ <name>Mathieu Baudier</name>\r
+ <email>mbaudier@argeo.org</email>\r
+ <organization>Argeo</organization>\r
+ <roles>\r
+ <role>architect</role>\r
+ <role>developer</role>\r
+ </roles>\r
+ <timezone>+1</timezone>\r
+ </developer>\r
+ </developers>\r
+ <build>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-compiler-plugin</artifactId>\r
+ <configuration>\r
+ <source>1.5</source>\r
+ <target>1.5</target>\r
+ </configuration>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-surefire-plugin</artifactId>\r
+ <configuration>\r
+ <skip>true</skip>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>surefire-it</id>\r
+ <phase>integration-test</phase>\r
+ <goals>\r
+ <goal>test</goal>\r
+ </goals>\r
+ <configuration>\r
+ <skip>false</skip>\r
+ <systemProperties>\r
+ <property>\r
+ <name>it.slc.base</name>\r
+ <value>\r
+ ${basedir}/src/test/slc\r
+ </value>\r
+ </property>\r
+ </systemProperties>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+ </plugins>\r
+ </build>\r
+ <reporting>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-surefire-report-plugin</artifactId>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-javadoc-plugin</artifactId>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-changelog-plugin</artifactId>\r
+ </plugin>\r
+ <!-- \r
+ <plugin>\r
+ <groupId>org.codehaus.mojo</groupId>\r
+ <artifactId>cobertura-maven-plugin</artifactId>\r
+ </plugin>\r
+ -->\r
+ </plugins>\r
+ </reporting>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>log4j</groupId>\r
+ <artifactId>log4j</artifactId>\r
+ <version>1.2.14</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate</artifactId>\r
+ <version>3.2.5.ga</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.springframework</groupId>\r
+ <artifactId>spring</artifactId>\r
+ <version>2.0.6</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.ant</groupId>\r
+ <artifactId>ant</artifactId>\r
+ <version>1.7.0</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.commons</groupId>\r
+ <artifactId>commons-io</artifactId>\r
+ <version>1.3.2</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.dbunit</groupId>\r
+ <artifactId>dbunit</artifactId>\r
+ <version>2.2</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>junit</groupId>\r
+ <artifactId>junit</artifactId>\r
+ <version>3.8.2</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>hsqldb</groupId>\r
+ <artifactId>hsqldb</artifactId>\r
+ <version>1.8.0.9</version>\r
+ </dependency>\r
+ </dependencies>\r
+ <dependencyManagement>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>javax.transaction</groupId>\r
+ <artifactId>jta</artifactId>\r
+ <version>1.0.1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.dbunit</groupId>\r
+ <artifactId>dbunit</artifactId>\r
+ <version>2.2</version>\r
+ <exclusions>\r
+ <exclusion>\r
+ <groupId>junit-addons</groupId>\r
+ <artifactId>junit-addons</artifactId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <groupId>poi</groupId>\r
+ <artifactId>poi</artifactId>\r
+ </exclusion>\r
+ </exclusions>\r
+ </dependency>\r
+ </dependencies>\r
+ </dependencyManagement>\r
+</project>
\ No newline at end of file
Properties all = prepareAllProperties(slcRootFile);\r
for (Object o : all.keySet()) {\r
String key = o.toString();\r
+ //System.out.println(key+"="+all.getProperty(key));\r
if (project.getUserProperty(key) == null) {// not already set\r
project.setUserProperty(key, all.getProperty(key));\r
}\r
Properties all = new Properties();\r
all.putAll(System.getProperties());\r
all.put(ROOT_FILE_PROPERTY, slcRootFile.getCanonicalPath());\r
+ // Remove basedir property in order to avoid conflict with Maven\r
+ if (all.containsKey("basedir"))\r
+ all.remove("basedir");\r
\r
Properties rootProps = loadFile(slcRootFile.getCanonicalPath());\r
\r
import org.apache.tools.ant.Project;\r
import org.apache.tools.ant.helper.ProjectHelperImpl;\r
\r
+import org.argeo.slc.core.UnsupportedException;\r
import org.argeo.slc.core.structure.DefaultSRegistry;\r
import org.argeo.slc.core.structure.SimpleSElement;\r
import org.argeo.slc.core.structure.StructureRegistry;\r
\r
@Override\r
public void parse(Project project, Object source) throws BuildException {\r
+ if (!(source instanceof File)) {\r
+ throw new UnsupportedException("Ant file", source);\r
+ }\r
+ File sourceFile = (File)source;\r
\r
// initialize config\r
SlcAntConfig slcAntConfig = new SlcAntConfig();\r
\r
+ System.out.println("Base dir prop2: " + project.getProperty("basedir"));\r
+ // In order to avoid base dire override when running in Maven\r
+ project.setProperty("basedir", sourceFile.getParentFile().getAbsolutePath());\r
if (!slcAntConfig.initProject(project)) {\r
// not SLC compatible, do normal Ant\r
super.parse(project, source);\r
log = LogFactory.getLog(SlcProjectHelper.class);\r
}\r
log.debug("SLC properties are set, starting initialization..");\r
+ log.debug("Base dir1: " + project.getBaseDir().getAbsoluteFile());\r
+ log.debug("Base dir prop1: " + project.getProperty("basedir"));\r
\r
// init Spring application context\r
initSpringContext(project);\r
+ log.debug("Base dir2: " + project.getBaseDir().getAbsoluteFile());\r
\r
// init structure registry\r
DefaultSRegistry registry = new DefaultSRegistry();\r
project.addReference(REF_STRUCTURE_REGISTRY, registry);\r
\r
+ log.debug("Base dir prop2: " + project.getProperty("basedir"));\r
+ // in order to prevent pb w/ basedir setting:\r
+ source = ((File) source).getAbsoluteFile();\r
// call the underlying implementation to do the actual work\r
super.parse(project, source);\r
\r
+ log.debug("Base dir3: " + project.getBaseDir().getAbsoluteFile());\r
// create structure root\r
registerProjectAndParents(project, slcAntConfig);\r
\r
.getUserProperty(SlcAntConfig.ROOT_DIR_PROPERTY))\r
.getAbsoluteFile();\r
File baseDir = project.getBaseDir().getAbsoluteFile();\r
-\r
List<File> dirs = new Vector<File>();\r
File currentDir = baseDir;\r
do {\r
--- /dev/null
+<html>\r
+<head></head>\r
+<body>\r
+Integration of SLC Deploy in Ant.\r
+</body>\r
+</html>
\ No newline at end of file
<html>\r
<head></head>\r
<body>\r
-Integration of SLC structure in Ant.\r
+Integration of SLC Structure in Ant.\r
</body>\r
</html>
\ No newline at end of file
+++ /dev/null
-# Tasks\r
-slc.test=org.argeo.slc.ant.test.SlcTestTask\r
-slc.deploy=org.argeo.slc.ant.deploy.SlcDeployTask\r
-slc.closeResult=org.argeo.slc.ant.test.SlcCloseTestResultTask\r
-slc.report=org.argeo.slc.ant.test.SlcReportTask\r
<html>\r
<head></head>\r
<body>\r
-SLC structure framework allowing to uniquely reference actions.\r
+SLC Structure framework allowing to uniquely reference actions.\r
</body>\r
</html>
\ No newline at end of file
+++ /dev/null
-<html>\r
-<head>\r
-<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">\r
-<title>SLC test results</title>\r
-</head>\r
-<frameset cols="30%,70%">\r
- <frame src="slc-resultsList.html" name="navigation">\r
- <frame src="about:blank" name="main">\r
- <noframes>\r
- <h2>Frame Alert</h2>\r
- <p>This document is designed to be viewed using the frames feature.\r
- If you see this message, you are using a non-frame-capable web client.\r
- </p>\r
- </noframes>\r
-</frameset>\r
-</html>\r
+++ /dev/null
-body {\r
- font-family: sans-serif;\r
- font-size: 12px;\r
- color: black;\r
- background-color: white;\r
-}\r
-\r
-h1 {\r
- font-family: sans-serif;\r
- font-size: 16px;\r
- font-weight: bold;\r
- color: #000000;\r
- padding: 0px 0px 5px 0px;\r
- margin: 0px;\r
-}\r
-\r
-h2 {\r
- font-family: sans-serif;\r
- font-size: 14px;\r
- font-weight: bold;\r
- color: #000000;\r
- padding: 5px 0px 5px 0px;\r
- margin: 0px;\r
- margin-top: 5px;\r
-}\r
-\r
-table,form {\r
- margin: 0px;\r
-}\r
-\r
-th {\r
- font-size: 12px;\r
- padding: 2px 20px 2px 2px;\r
- vertical-align: top;\r
- text-align: left;\r
-}\r
-\r
-td {\r
- font-size: 12px;\r
- padding: 1px;\r
- vertical-align: top;\r
- text-align: left;\r
-}\r
-\r
-.passed {\r
- color: green;\r
-}\r
-\r
-.failed {\r
- color: red;\r
-}\r
-\r
-a {\r
- text-decoration: none;\r
-}\r
-\r
-a.nav {\r
- color: #0066CC;\r
- text-decoration: none;\r
-}\r
-\r
-a:hover {\r
- text-decoration: underline;\r
-}
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.structure">\r
- <class name="SimpleSElement" table="SIMPLE_SELEMENT">\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
- <property name="description" column="DESCRIPTION"\r
- not-null="true" />\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.structure.tree">\r
- <class name="TreeSPath" table="TREE_SPATH">\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
- <property name="asUniqueString" column="PATH" not-null="true"\r
- unique="true" />\r
- <property name="separator" column="SEPARATOR" not-null="true" />\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.structure.tree">\r
- <class name="TreeSRegistry" table="TREE_SREGISTRY">\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
-\r
- <many-to-one name="root" column="ROOT_PATH_ID" unique="true"\r
- not-null="true" />\r
- \r
- <map name="elements" table="REGISTRY_ELEMENTS" cascade="all"\r
- lazy="false" sort="natural">\r
- <key column="PARENT_ID" />\r
- <map-key-many-to-many class="TreeSPath" column="PATH" />\r
-\r
- <many-to-many\r
- class="org.argeo.slc.core.structure.SimpleSElement"\r
- column="ELEMENT_ID" unique="true" lazy="false" />\r
- </map>\r
-\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.test">\r
- <class name="NumericTRId" table="NUMERIC_TR_ID">\r
-\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
- <property name="value" column="VALUE" not-null="true"\r
- unique="true" />\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.test">\r
- <class name="SimpleResultPart" table="SIMPLE_RESULT_PART">\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
- <property name="status" column="STATUS" not-null="true" />\r
- <property name="message" column="MESSAGE" not-null="true" />\r
- <property name="exception" column="EXCEPTION" not-null="false" />\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.test">\r
- <class name="TestResultId" table="TEST_RESULT_ID">\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.test.tree">\r
- <class name="PartSubList" table="PART_SUB_LIST">\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
- <list name="parts" cascade="all" lazy="false">\r
- <key column="PART_SUBLIST_ID" />\r
- <list-index column="INDX" />\r
-\r
- <one-to-many\r
- class="org.argeo.slc.core.test.SimpleResultPart" />\r
- </list>\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0"?>\r
-<!DOCTYPE hibernate-mapping PUBLIC\r
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
-<hibernate-mapping package="org.argeo.slc.core.test.tree">\r
- <class name="TreeTestResult" table="TREE_TEST_RESULT">\r
- <id name="tid" column="T_ID">\r
- <generator class="native" />\r
- </id>\r
-\r
- <property name="closeDate" column="CLOSE_DATE" type="timestamp"\r
- not-null="false" />\r
-\r
- <many-to-one name="numericResultId" unique="true"\r
- not-null="true" column="TEST_RESULT_ID" cascade="all" lazy="false" />\r
-\r
- <map name="resultParts" table="RESULT_PARTS_MAP" cascade="all"\r
- lazy="false" sort="natural">\r
- <key column="PARENT_ID" />\r
- <map-key-many-to-many\r
- class="org.argeo.slc.core.structure.tree.TreeSPath" column="PATH" />\r
- <many-to-many class="PartSubList" column="PART_SUB_LIST_ID"\r
- unique="true" lazy="false" />\r
- </map>\r
- </class>\r
-</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+# Tasks\r
+slc.test=org.argeo.slc.ant.test.SlcTestTask\r
+slc.deploy=org.argeo.slc.ant.deploy.SlcDeployTask\r
+slc.closeResult=org.argeo.slc.ant.test.SlcCloseTestResultTask\r
+slc.report=org.argeo.slc.ant.test.SlcReportTask\r
--- /dev/null
+<html>\r
+<head>\r
+<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">\r
+<title>SLC test results</title>\r
+</head>\r
+<frameset cols="30%,70%">\r
+ <frame src="slc-resultsList.html" name="navigation">\r
+ <frame src="about:blank" name="main">\r
+ <noframes>\r
+ <h2>Frame Alert</h2>\r
+ <p>This document is designed to be viewed using the frames feature.\r
+ If you see this message, you are using a non-frame-capable web client.\r
+ </p>\r
+ </noframes>\r
+</frameset>\r
+</html>\r
--- /dev/null
+body {\r
+ font-family: sans-serif;\r
+ font-size: 12px;\r
+ color: black;\r
+ background-color: white;\r
+}\r
+\r
+h1 {\r
+ font-family: sans-serif;\r
+ font-size: 16px;\r
+ font-weight: bold;\r
+ color: #000000;\r
+ padding: 0px 0px 5px 0px;\r
+ margin: 0px;\r
+}\r
+\r
+h2 {\r
+ font-family: sans-serif;\r
+ font-size: 14px;\r
+ font-weight: bold;\r
+ color: #000000;\r
+ padding: 5px 0px 5px 0px;\r
+ margin: 0px;\r
+ margin-top: 5px;\r
+}\r
+\r
+table,form {\r
+ margin: 0px;\r
+}\r
+\r
+th {\r
+ font-size: 12px;\r
+ padding: 2px 20px 2px 2px;\r
+ vertical-align: top;\r
+ text-align: left;\r
+}\r
+\r
+td {\r
+ font-size: 12px;\r
+ padding: 1px;\r
+ vertical-align: top;\r
+ text-align: left;\r
+}\r
+\r
+.passed {\r
+ color: green;\r
+}\r
+\r
+.failed {\r
+ color: red;\r
+}\r
+\r
+a {\r
+ text-decoration: none;\r
+}\r
+\r
+a.nav {\r
+ color: #0066CC;\r
+ text-decoration: none;\r
+}\r
+\r
+a:hover {\r
+ text-decoration: underline;\r
+}
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.structure">\r
+ <class name="SimpleSElement" table="SIMPLE_SELEMENT">\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+ <property name="description" column="DESCRIPTION"\r
+ not-null="true" />\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.structure.tree">\r
+ <class name="TreeSPath" table="TREE_SPATH">\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+ <property name="asUniqueString" column="PATH" not-null="true"\r
+ unique="true" />\r
+ <property name="separator" column="SEPARATOR" not-null="true" />\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.structure.tree">\r
+ <class name="TreeSRegistry" table="TREE_SREGISTRY">\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+\r
+ <many-to-one name="root" column="ROOT_PATH_ID" unique="true"\r
+ not-null="true" />\r
+ \r
+ <map name="elements" table="REGISTRY_ELEMENTS" cascade="all"\r
+ lazy="false" sort="natural">\r
+ <key column="PARENT_ID" />\r
+ <map-key-many-to-many class="TreeSPath" column="PATH" />\r
+\r
+ <many-to-many\r
+ class="org.argeo.slc.core.structure.SimpleSElement"\r
+ column="ELEMENT_ID" unique="true" lazy="false" />\r
+ </map>\r
+\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.test">\r
+ <class name="NumericTRId" table="NUMERIC_TR_ID">\r
+\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+ <property name="value" column="VALUE" not-null="true"\r
+ unique="true" />\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.test">\r
+ <class name="SimpleResultPart" table="SIMPLE_RESULT_PART">\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+ <property name="status" column="STATUS" not-null="true" />\r
+ <property name="message" column="MESSAGE" not-null="true" />\r
+ <property name="exception" column="EXCEPTION" not-null="false" />\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.test">\r
+ <class name="TestResultId" table="TEST_RESULT_ID">\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.test.tree">\r
+ <class name="PartSubList" table="PART_SUB_LIST">\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+ <list name="parts" cascade="all" lazy="false">\r
+ <key column="PART_SUBLIST_ID" />\r
+ <list-index column="INDX" />\r
+\r
+ <one-to-many\r
+ class="org.argeo.slc.core.test.SimpleResultPart" />\r
+ </list>\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0"?>\r
+<!DOCTYPE hibernate-mapping PUBLIC\r
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"\r
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
+<hibernate-mapping package="org.argeo.slc.core.test.tree">\r
+ <class name="TreeTestResult" table="TREE_TEST_RESULT">\r
+ <id name="tid" column="T_ID">\r
+ <generator class="native" />\r
+ </id>\r
+\r
+ <property name="closeDate" column="CLOSE_DATE" type="timestamp"\r
+ not-null="false" />\r
+\r
+ <many-to-one name="numericResultId" unique="true"\r
+ not-null="true" column="TEST_RESULT_ID" cascade="all" lazy="false" />\r
+\r
+ <map name="resultParts" table="RESULT_PARTS_MAP" cascade="all"\r
+ lazy="false" sort="natural">\r
+ <key column="PARENT_ID" />\r
+ <map-key-many-to-many\r
+ class="org.argeo.slc.core.structure.tree.TreeSPath" column="PATH" />\r
+ <many-to-many class="PartSubList" column="PART_SUB_LIST_ID"\r
+ unique="true" lazy="false" />\r
+ </map>\r
+ </class>\r
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null
+Argeo SLC Site
\ No newline at end of file
+++ /dev/null
-# Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=INFO, console\r
-\r
-## Levels\r
-# Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-# Spring\r
-log4j.logger.org.springframework=INFO\r
-# Hibernate\r
-log4j.logger.org.hibernate=WARN\r
-#log4j.logger.org.hibernate.SQL=TRACE\r
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
-#log4j.logger.org.hibernate.type=TRACE\r
-\r
-\r
-## Appenders\r
-# A1 is set to be a ConsoleAppender.\r
-log4j.appender.console=org.apache.log4j.ConsoleAppender\r
-\r
-# A1 uses PatternLayout.\r
-log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %n\r
-\r
\r
import org.springframework.context.ApplicationContext;\r
\r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
import org.apache.tools.ant.Project;\r
\r
import junit.framework.TestCase;\r
\r
/** High level tests for SLC Ant. */\r
public class TestAntBuild extends TestCase {\r
+ private static Log log = LogFactory.getLog(TestAntBuild.class);\r
+\r
/** Tests an end-to-end Ant run. */\r
public void testAllRunSimple() {\r
- File[] reportFiles = new File("src/test/slc/work/results/report/")\r
- .listFiles();\r
+ String slcBase = System.getProperty("it.slc.base");\r
+ File slcBaseDir = new File(slcBase).getAbsoluteFile();\r
+ log.info("SLC base: " + slcBaseDir);\r
+\r
+ String reportDirPath = slcBaseDir.getPath() + "/work/results/report/";\r
+ File[] reportFiles = new File(reportDirPath).listFiles();\r
for (File file : reportFiles) {\r
file.delete();\r
}\r
\r
- File slcBaseDir = new File("./src/test/slc").getAbsoluteFile();\r
-\r
File antFile = new File(slcBaseDir.getPath()\r
+ "/root/Category1/SubCategory2/build.xml");\r
Project p = AntRegistryUtil.runAll(antFile);\r
TestStatus.FAILED,\r
"Compare eu-reform-expected.txt with eu-reform-reached.txt");\r
\r
- String reportDirPath = "src/test/slc/work/results/report/";\r
assertTrue(new File(reportDirPath + "index.html").exists());\r
assertTrue(new File(reportDirPath + "slc-resultsList.html").exists());\r
assertTrue(new File(reportDirPath + "slc-result-1.html").exists());\r
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
-\r
- <!-- Results -->\r
- <bean id="dataSource"\r
- class="org.springframework.jdbc.datasource.SingleConnectionDataSource"\r
- destroy-method="destroy">\r
- <property name="driverClassName" value="org.hsqldb.jdbcDriver" />\r
- <property name="url" value="jdbc:hsqldb:mem:test" />\r
- <property name="username" value="sa" />\r
- <property name="password" value="" />\r
- <property name="suppressClose" value="true" />\r
- </bean>\r
-\r
- <bean id="sessionFactory"\r
- class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">\r
- <property name="dataSource" ref="dataSource" />\r
- <property name="mappingResources">\r
- <list>\r
- <value>\r
- org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml\r
- </value>\r
- <value>\r
- org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml\r
- </value>\r
- <value>\r
- org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml\r
- </value>\r
- <value>\r
- org/argeo/slc/hibernate/test/NumericTRId.hbm.xml\r
- </value>\r
- <value>\r
- org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml\r
- </value>\r
- <value>\r
- org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml\r
- </value>\r
- <value>\r
- org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml\r
- </value>\r
- </list>\r
- </property>\r
- <property name="hibernateProperties">\r
- <value>\r
- hibernate.dialect=org.hibernate.dialect.HSQLDialect\r
- hibernate.hbm2ddl.auto=create\r
- </value>\r
- </property>\r
- </bean>\r
-\r
- <bean id="treeSPathDao"\r
- class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">\r
- <property name="sessionFactory" ref="sessionFactory" />\r
- </bean>\r
- \r
- <bean id="treeSRegistryDao"\r
- class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">\r
- <property name="sessionFactory" ref="sessionFactory" />\r
- </bean>\r
- \r
- <bean id="testResultDao"\r
- class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">\r
- <property name="sessionFactory" ref="sessionFactory" />\r
- </bean>\r
-</beans>
\ No newline at end of file
--- /dev/null
+# Set root logger level to DEBUG and its only appender to A1.\r
+log4j.rootLogger=INFO, console\r
+\r
+## Levels\r
+# Slc\r
+log4j.logger.org.argeo.slc=TRACE\r
+# Spring\r
+log4j.logger.org.springframework=INFO\r
+# Hibernate\r
+log4j.logger.org.hibernate=WARN\r
+#log4j.logger.org.hibernate.SQL=TRACE\r
+#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
+#log4j.logger.org.hibernate.type=TRACE\r
+\r
+\r
+## Appenders\r
+# A1 is set to be a ConsoleAppender.\r
+log4j.appender.console=org.apache.log4j.ConsoleAppender\r
+\r
+# A1 uses PatternLayout.\r
+log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %F%L%n\r
+\r
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
+\r
+ <!-- Results -->\r
+ <bean id="dataSource"\r
+ class="org.springframework.jdbc.datasource.SingleConnectionDataSource"\r
+ destroy-method="destroy">\r
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver" />\r
+ <property name="url" value="jdbc:hsqldb:mem:test" />\r
+ <property name="username" value="sa" />\r
+ <property name="password" value="" />\r
+ <property name="suppressClose" value="true" />\r
+ </bean>\r
+\r
+ <bean id="sessionFactory"\r
+ class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">\r
+ <property name="dataSource" ref="dataSource" />\r
+ <property name="mappingResources">\r
+ <list>\r
+ <value>\r
+ org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml\r
+ </value>\r
+ <value>\r
+ org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml\r
+ </value>\r
+ <value>\r
+ org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml\r
+ </value>\r
+ <value>\r
+ org/argeo/slc/hibernate/test/NumericTRId.hbm.xml\r
+ </value>\r
+ <value>\r
+ org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml\r
+ </value>\r
+ <value>\r
+ org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml\r
+ </value>\r
+ <value>\r
+ org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml\r
+ </value>\r
+ </list>\r
+ </property>\r
+ <property name="hibernateProperties">\r
+ <value>\r
+ hibernate.dialect=org.hibernate.dialect.HSQLDialect\r
+ hibernate.hbm2ddl.auto=create\r
+ </value>\r
+ </property>\r
+ </bean>\r
+\r
+ <bean id="treeSPathDao"\r
+ class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">\r
+ <property name="sessionFactory" ref="sessionFactory" />\r
+ </bean>\r
+ \r
+ <bean id="treeSRegistryDao"\r
+ class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">\r
+ <property name="sessionFactory" ref="sessionFactory" />\r
+ </bean>\r
+ \r
+ <bean id="testResultDao"\r
+ class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">\r
+ <property name="sessionFactory" ref="sessionFactory" />\r
+ </bean>\r
+</beans>
\ No newline at end of file
\r
# A1 uses PatternLayout.\r
log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %n\r
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %F:%L%n\r
\r
projects / gpl / argeo-slc.git / commitdiff