November 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8826 - in modules/test/trunk: build/ide/intellij/idea60/modules/mc and 41 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-11-05 04:52:33 -0500 (Mon, 05 Nov 2007) New Revision: 8826 Added: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ExcludeType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/HTMLReportsType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/IncludeType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ParameterType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/PropertyType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ReportsType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ValueType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/XMLReportsType.java modules/test/trunk/tooling/core/ modules/test/trunk/tooling/core/pom.xml modules/test/trunk/tooling/core/src/ modules/test/trunk/tooling/core/src/main/ modules/test/trunk/tooling/core/src/main/java/ modules/test/trunk/tooling/core/src/main/java/org/ modules/test/trunk/tooling/core/src/main/java/org/jboss/ modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/ modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/ modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/JavaBuilder.java modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/ToolingConstants.java modules/test/trunk/tooling/examples/ modules/test/trunk/tooling/examples/maven2/ modules/test/trunk/tooling/examples/maven2/pom.xml modules/test/trunk/tooling/examples/maven2/src/ modules/test/trunk/tooling/examples/maven2/src/main/ modules/test/trunk/tooling/examples/maven2/src/main/java/ modules/test/trunk/tooling/examples/maven2/src/main/java/org/ modules/test/trunk/tooling/examples/maven2/src/main/java/org/jboss/ modules/test/trunk/tooling/examples/maven2/src/main/java/org/jboss/test/ modules/test/trunk/tooling/examples/maven2/src/main/java/org/jboss/test/unit/ modules/test/trunk/tooling/examples/maven2/src/main/java/org/jboss/test/unit/tooling/ modules/test/trunk/tooling/examples/maven2/src/test/ modules/test/trunk/tooling/examples/maven2/src/test/java/ modules/test/trunk/tooling/examples/maven2/src/test/java/org/ modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/ modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/test/ modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/test/unit/ modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/test/unit/tooling/ modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/test/unit/tooling/TestSimple.java modules/test/trunk/tooling/examples/maven2/src/test/resources/ modules/test/trunk/tooling/examples/maven2/src/test/resources/jboss-unit.xml modules/test/trunk/tooling/maven2/pom.xml modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/CasesDescription.java modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Parameter.java modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Reports.java modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Testsuite.java Removed: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ExcludeType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/HTMLReportsType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/IncludeType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ParameterType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/PropertyType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ReportsType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TaskExecutingThread.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ToolingConstants.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ValueType.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/XMLReportsType.java Modified: modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml modules/test/trunk/build/ide/intellij/idea60/modules/unit/unit.iml modules/test/trunk/build/ide/intellij/idea70/modules/docs/docs.iml modules/test/trunk/mc/pom.xml modules/test/trunk/pom.xml modules/test/trunk/remote/pom.xml modules/test/trunk/test/generic/pom.xml modules/test/trunk/tooling/ant/pom.xml modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TestsType.java modules/test/trunk/tooling/build.xml modules/test/trunk/tooling/pom.xml modules/test/trunk/unit/pom.xml modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/MainBuilder.java Log: initial jboss unit maven2 plugin Modified: modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml =================================================================== --- modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,171 +1,252 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../mc/target/classes" /> <exclude-output /> + <output-test url="file://$MODULE_DIR$/../../../../../../mc/target/test-classes" /> <content url="file://$MODULE_DIR$/../../../../../../mc"> <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/test/resources" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../mc/target/classes" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../mc/target/test-classes" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="unit" /> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="ant:ant:1.6.5"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="ant:ant-junit:1.6.5"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-httpclient:commons-httpclient:2.0.2"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-slide:webdavlib:2.0"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-managed.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-slide/webdavlib/2.0/webdavlib-2.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-xerces:xercesImpl:2.7.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-metatype.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-xerces:xml-apis:2.7.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-classloader.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="javax.activation:activation:1.0.2"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-client.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss.profiler.jvmti:jboss-profiler-jvmti:1.0.0.CR5"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-common-core:2.0.4.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-common-logging-log4j:2.0.4.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container-metadata-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-common-logging-spi:2.0.4.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-logging-spi:2.0.3.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-kernel.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="junit:junit:3.8.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="log4j:log4j:1.2.14"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-container:2.0.0.Beta4"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta4/jboss-container-2.0.0.Beta4.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta4/jboss-container-2.0.0.Beta4-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-dependency:2.0.0.Beta4"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-core.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta4/jboss-dependency-2.0.0.Beta4.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta4/jboss-dependency-2.0.0.Beta4-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-kernel:2.0.0.Beta4"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container-metadata.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta4/jboss-kernel-2.0.0.Beta4.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta4/jboss-kernel-2.0.0.Beta4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module" module-name="unit" exported="" /> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:javassist:3.6-beta"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/javassist/3.6-beta/javassist-3.6-beta.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/javassist/3.6-beta/javassist-3.6-beta-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jboss-common-core:2.2.1.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jboss-test:1.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jbossxb:2.0.0.CR4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="oswego-concurrent:concurrent:1.3.4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="wutka-dtdparser:dtdparser121:1.2.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Modified: modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml =================================================================== --- modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,204 +1,464 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../remote/target/classes" /> <exclude-output /> + <output-test url="file://$MODULE_DIR$/../../../../../../remote/target/test-classes" /> <content url="file://$MODULE_DIR$/../../../../../../remote"> <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/test/resources" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../remote/target/classes" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../remote/target/test-classes" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="unit" /> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="ant:ant:1.6.5"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-httpclient/lib/commons-httpclient.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="ant:ant-junit:1.6.5"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="ant:ant-launcher:1.6.5"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="ant:ant-nodeps:1.6.5"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="test" /> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-httpclient:commons-httpclient:3.0.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-managed.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-log4j:log4j:1.2.14"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="apache-slide:webdavlib:2.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-slide/webdavlib/2.0/webdavlib-2.0.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-xerces:xercesImpl:2.7.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-metatype.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="apache-xerces:xml-apis:2.7.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="cargo:core:0.9-portal"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-kernel.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/cargo/core/0.9-portal/core-0.9-portal.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="dom4j:dom4j:1.6.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container-metadata-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="hibernate:hibernate3:3.2.3.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/hibernate/hibernate3/3.2.3.GA/hibernate3-3.2.3.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/hibernate/hibernate3/3.2.3.GA/hibernate3-3.2.3.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/hibernate/hibernate3/3.2.3.GA/hibernate3-3.2.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="javax.activation:activation:1.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="javax.servlet:servlet-api:2.4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss:4.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss-jca:4.0.4.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-classloader.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss-local-jdbc:4.0.4.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jbossas/core-libs/jboss-local-jdbc/4.0.4.GA/jboss-local-jdbc-4.0.4.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss-transaction:4.0.4.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container-metadata.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jnpserver:4.0.4.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss.profiler.jvmti:jboss-profiler-jvmti:1.0.0.CR5"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-backport-concurrent:2.1.0.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-core.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-backport-concurrent/2.1.0.GA/jboss-backport-concurrent-2.1.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-common-core:2.2.0.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-core/2.2.0.GA/jboss-common-core-2.2.0.GA.jar!/" /> </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-core/2.2.0.GA/jboss-common-core-2.2.0.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-core/2.2.0.GA/jboss-common-core-2.2.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-common-logging-log4j:2.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar!/" /> + </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-common-logging-spi:2.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-j2ee:4.2.0.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.0.GA/jboss-j2ee-4.2.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-jmx:4.2.0.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-jmx/4.2.0.GA/jboss-jmx-4.2.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-logging-spi:2.0.3.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-client.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-system:4.2.0.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/jboss/jboss-system/4.2.0.GA/jboss-system-4.2.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="junit:junit:3.8.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="log4j:log4j:1.2.14"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.codehaus.cargo:cargo-core-uberjar:0.8"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-container:2.0.0.Beta4"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta4/jboss-container-2.0.0.Beta4.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta4/jboss-container-2.0.0.Beta4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-dependency:2.0.0.Beta4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta4/jboss-dependency-2.0.0.Beta4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta4/jboss-dependency-2.0.0.Beta4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-kernel:2.0.0.Beta4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta4/jboss-kernel-2.0.0.Beta4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta4/jboss-kernel-2.0.0.Beta4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.portal.common:jboss-portal-modules-common:1.1.0-20071101.234809-2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/portal/common/jboss-portal-modules-common/1.1.0-SNAPSHOT/jboss-portal-modules-common-1.1.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/portal/common/jboss-portal-modules-common/1.1.0-SNAPSHOT/jboss-portal-modules-common-1.1.0-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.portal.test:jboss-portal-modules-test-core:1.1.0-SNAPSHOT"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/portal/test/jboss-portal-modules-test-core/1.1.0-SNAPSHOT/jboss-portal-modules-test-core-1.1.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module" module-name="unit" exported="" /> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:javassist:3.6-beta"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/javassist/3.6-beta/javassist-3.6-beta.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/javassist/3.6-beta/javassist-3.6-beta-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jboss-common-core:2.2.1.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jboss-test:1.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jbossxb:2.0.0.CR4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="oswego-concurrent:concurrent:1.3.4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="sun-opends:opends-core:1.0.0-BUILD04"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/sun-opends/opends-core/1.0.0-BUILD04/opends-core-1.0.0-BUILD04.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="wutka-dtdparser:dtdparser121:1.2.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="xml-apis:xml-apis:1.0.b2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml =================================================================== --- modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,16 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../tooling/target/classes" /> <exclude-output /> + <output-test url="file://$MODULE_DIR$/../../../../../../tooling/target/test-classes" /> <content url="file://$MODULE_DIR$/../../../../../../tooling"> - <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/ant/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/ant/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/core/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/examples/maven2/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/examples/maven2/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/maven2/src/main/java" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module-library"> <library> <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-ant/lib/ant.jar!/" /> </CLASSES> <JAVADOC /> @@ -20,13 +35,40 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../tools/lib/ant-junit.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-ant/lib/ant-junit.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntry type="module" module-name="unit" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../../../../.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: modules/test/trunk/build/ide/intellij/idea60/modules/unit/unit.iml =================================================================== --- modules/test/trunk/build/ide/intellij/idea60/modules/unit/unit.iml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/build/ide/intellij/idea60/modules/unit/unit.iml 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../unit/target/classes" /> <exclude-output /> + <output-test url="file://$MODULE_DIR$/../../../../../../unit/target/test-classes" /> <content url="file://$MODULE_DIR$/../../../../../../unit"> <sourceFolder url="file://$MODULE_DIR$/../../../../../../unit/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../unit/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../../../../../unit/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../unit/src/test/resources" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../unit/target/classes" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../unit/target/test-classes" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: modules/test/trunk/build/ide/intellij/idea70/modules/docs/docs.iml =================================================================== --- modules/test/trunk/build/ide/intellij/idea70/modules/docs/docs.iml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/build/ide/intellij/idea70/modules/docs/docs.iml 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../docs/target/classes" /> <exclude-output /> + <output-test url="file://$MODULE_DIR$/../../../../../../docs/target/test-classes" /> <content url="file://$MODULE_DIR$/../../../../../../docs" /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> Modified: modules/test/trunk/mc/pom.xml =================================================================== --- modules/test/trunk/mc/pom.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/mc/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -6,14 +6,14 @@ <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-modules-test-mc</artifactId> + <artifactId>jboss-unit-mc</artifactId> <packaging>jar</packaging> - <name>JBoss Portal Modules Test MC</name> + <name>JBoss Unit MC</name> <dependencies> <dependency> <groupId>org.jboss.portal.test</groupId> - <artifactId>jboss-portal-modules-test-unit</artifactId> + <artifactId>jboss-unit</artifactId> <version>1.1.0-SNAPSHOT</version> </dependency> <dependency> Modified: modules/test/trunk/pom.xml =================================================================== --- modules/test/trunk/pom.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -132,6 +132,14 @@ <module>test/jboss</module> </modules> + <profiles> + <profile> + <id>docs</id> + <modules> + <module>docs</module> + </modules> + </profile> + </profiles> <issueManagement> <system>JIRA</system> Modified: modules/test/trunk/remote/pom.xml =================================================================== --- modules/test/trunk/remote/pom.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/remote/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -6,14 +6,14 @@ <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-modules-test-remote</artifactId> + <artifactId>jboss-unit-remote</artifactId> <packaging>jar</packaging> - <name>JBoss Portal Modules Test Remote</name> + <name>JBoss Unit Remote</name> <dependencies> <dependency> <groupId>org.jboss.portal.test</groupId> - <artifactId>jboss-portal-modules-test-unit</artifactId> + <artifactId>jboss-unit</artifactId> <version>1.1.0-SNAPSHOT</version> </dependency> <dependency> Modified: modules/test/trunk/test/generic/pom.xml =================================================================== --- modules/test/trunk/test/generic/pom.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/test/generic/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -71,6 +71,12 @@ <build> <sourceDirectory>../src/main/java</sourceDirectory> + <resources> + <resource> + <directory>resources</directory> + </resource> + </resources> + <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -83,15 +89,15 @@ </includes> </configuration> </plugin> -  -  -  -  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration>    -  -  + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> Modified: modules/test/trunk/tooling/ant/pom.xml =================================================================== --- modules/test/trunk/tooling/ant/pom.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -2,13 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.test</groupId> - <artifactId>jboss-portal-modules-test-tooling</artifactId> + <artifactId>jboss-unit-tooling-aggregator</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-modules-test-tooling-ant</artifactId> + <artifactId>jboss-unit-tooling-ant</artifactId> <packaging>jar</packaging> - <name>JBoss Portal Modules Test Tooling Ant</name> + <name>JBoss Unit Tooling Ant</name> <dependencies> <dependency> @@ -23,9 +23,14 @@ </dependency> <dependency> <groupId>org.jboss.portal.test</groupId> - <artifactId>jboss-portal-modules-test-unit</artifactId> + <artifactId>jboss-unit</artifactId> <version>1.1.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-unit-tooling</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> </dependencies> <build> Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ExcludeType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ExcludeType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ExcludeType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,83 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class ExcludeType -{ - private String id; - - private String ids; - - private String idPatterns; - - private String keywords; - - - public ExcludeType() - { - } - - public String getId() - { - return id; - } - - public void setId(String id) - { - this.id = id; - } - - public String getIds() - { - return ids; - } - - public void setIds(String ids) - { - this.ids = ids; - } - - public String getIdPatterns() - { - return idPatterns; - } - -// public void setIdPatterns(String idPatterns) -// { -// this.idPatterns = idPatterns; -// } - - public String getKeywords() - { - return keywords; - } - - public void setKeywords(String keywords) - { - this.keywords = keywords; - } -} Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/HTMLReportsType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/HTMLReportsType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/HTMLReportsType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,46 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class HTMLReportsType -{ - public HTMLReportsType() - { - } - - private String toDir = "."; - - public String getToDir() - { - return toDir; - } - - public void setToDir(String toDir) - { - this.toDir = toDir; - } -} Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/IncludeType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/IncludeType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/IncludeType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,83 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class IncludeType -{ - private String id; - - private String ids; - - private String idPatterns; - - private String keywords; - - - public IncludeType() - { - } - - public String getId() - { - return id; - } - - public void setId(String id) - { - this.id = id; - } - - public String getIds() - { - return ids; - } - - public void setIds(String ids) - { - this.ids = ids; - } - - public String getIdPatterns() - { - return idPatterns; - } - -// public void setIdPatterns(String idPatterns) -// { -// this.idPatterns = idPatterns; -// } - - public String getKeywords() - { - return keywords; - } - - public void setKeywords(String keywords) - { - this.keywords = keywords; - } -} Modified: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -25,16 +25,15 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator; -import org.apache.tools.ant.taskdefs.optional.junit.AggregateTransformer; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Environment; +import org.jboss.unit.tooling.ant.configuration.ReportsType; +import org.jboss.unit.tooling.ant.configuration.ParameterType; import java.util.List; import java.util.LinkedList; import java.util.Set; import java.util.HashSet; -import java.io.File; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> @@ -115,92 +114,14 @@ } - - //Not working at the moment - issues with using <fileset> dynamicly -// if (getReports() != null && getReports().getXmlReports() != null && getReports().getHtmlReports() != null) -// { -// try -// { -// generateHTMLReports(createJunitReporter()); -// } -// catch (Exception e) -// { -// e.printStackTrace(); -// } -// } - } - private XMLResultAggregator createJunitReporter() - { - XMLResultAggregator reporter = null; - try - { - - if (getProject() == null) - { - throw new IllegalStateException("Current project is missing. Task was not setup properly"); - } - - reporter = (XMLResultAggregator)getProject().createTask("junitreport"); - - - return reporter; - - } - catch (BuildException e) - { - throw new IllegalStateException("Failed to create <java> ant task: ", e); - } - } - public void addConfiguredSysproperty(Environment.Variable variable) { sysproperties.add(variable); } -// private void generateHTMLReports(XMLResultAggregator reporter) throws Exception -// { -// -// String htmlToDir = getReports().getHtmlReports().getToDir(); -// -// String xmlDir = getReports().getXmlReports().getToDir(); -// -// MainBuilder.checkCreateOutputDirectory(htmlToDir); -// -// reporter.setTodir(new File(htmlToDir)); -// -// -// // <report> -// AggregateTransformer report = reporter.createReport(); -// -// AggregateTransformer.Format format; -// format = new AggregateTransformer.Format(); -// format.setValue(AggregateTransformer.FRAMES); -// report.setFormat(format); -// report.setTodir(new File(htmlToDir)); -// -// //String includeFile = JUnitTestReport.TEST_FILE_NAME_START + "*.xml"; -// String includeFile = "*.xml"; -// -// FileSet fs = new FileSet(); -// -// //File toDir = new File(xmlDir); -// -// fs.setDir(new File(xmlDir)); -// -// -// -// fs.createIncludesFile().setName(includeFile); -// -// -// -// reporter.addFileSet(fs); -// -// reporter.execute(); -// } - public ReportsType getReports() { return reports; Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ParameterType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ParameterType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ParameterType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,89 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -import java.util.LinkedList; -import java.util.List; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class ParameterType -{ - - private String name; - - private List<String> values = new LinkedList<String>(); - - public boolean equals(Object o) - { - if (this == o) - { - return true; - } - if (o == null || getClass() != o.getClass()) - { - return false; - } - - ParameterType that = (ParameterType)o; - - if (!name.equals(that.name)) - { - return false; - } - - return true; - } - - public int hashCode() - { - int result; - result = name.hashCode(); - result = 31 * result + (values != null ? values.hashCode() : 0); - return result; - } - - public void addConfiguredValue(ValueType value) - { - values.add(value.toString()); - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public List<String> getValues() - { - return values; - } - - -} Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/PropertyType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/PropertyType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/PropertyType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,59 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.unit.tooling.ant; - -/** - * A property. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PropertyType -{ - - /** . */ - private String name; - - /** . */ - private String value; - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } -} Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ReportsType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ReportsType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ReportsType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,68 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class ReportsType -{ - - private XMLReportsType xmlReports; - - private HTMLReportsType htmlReports; - - private boolean noConsole; - - - public boolean isNoConsole() - { - return noConsole; - } - - public void setNoConsole(boolean noConsole) - { - this.noConsole = noConsole; - } - - public void addConfiguredXml(XMLReportsType xml) - { - xmlReports = xml; - } - - public void addConfiguredHtml(HTMLReportsType html) - { - htmlReports = html; - } - - public XMLReportsType getXMLReports() - { - return xmlReports; - } - - public HTMLReportsType getHTMLReports() - { - return htmlReports; - } -} Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TaskExecutingThread.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TaskExecutingThread.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TaskExecutingThread.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,50 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -import org.apache.tools.ant.taskdefs.Java; -import org.apache.tools.ant.Task; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class TaskExecutingThread extends Thread -{ - - private Task task; - - private TaskExecutingThread() - { - } - - public TaskExecutingThread(Task task) - { - this.task = task; - } - - public void run() - { - this.task.execute(); - } -} Modified: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TestsType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TestsType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TestsType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -24,22 +24,23 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Environment; -import org.apache.tools.ant.types.Assertions; import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.Path; +import org.jboss.unit.tooling.JavaBuilder; +import org.jboss.unit.tooling.TaskExecutingThread; +import org.jboss.unit.tooling.ant.configuration.ExcludeType; +import org.jboss.unit.tooling.ant.configuration.IncludeType; +import org.jboss.unit.tooling.ant.configuration.ParameterType; +import org.jboss.unit.tooling.ant.configuration.PropertyType; +import org.jboss.unit.tooling.ant.configuration.ReportsType; -import static org.jboss.unit.tooling.ant.ToolingConstants.*; - -import java.util.List; -import java.util.LinkedList; -import java.util.Set; import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.util.Hashtable; import java.util.HashSet; +import java.util.Hashtable; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> @@ -84,10 +85,6 @@ Java javaTask = createJava(); - addArguments(javaTask); - - javaTask.setClassname("org.jboss.unit.tooling.Main"); - try { System.out.println("Invoking java: " + javaTask.getCommandLine().toString()); @@ -109,41 +106,12 @@ try { - if (getProject() == null) - { - throw new IllegalStateException("Current project is missing. Task was not setup properly"); - } + JavaBuilder javaBuilder = new JavaBuilder(getProject()); - javaTask = (Java)getProject().createTask("java"); + addArguments(javaBuilder); - // Set jboss logging to use JUL - Environment.Variable pluginProperty = new Environment.Variable(); - pluginProperty.setKey("org.jboss.logging.Logger.pluginClass"); - pluginProperty.setValue("org.jboss.logging.jdk.JDK14LoggerPlugin"); - javaTask.addSysproperty(pluginProperty); + javaTask = javaBuilder.buildJava(); - // Set JUL to configure using the logging.properties file found in the current dir - Environment.Variable julProperty = new Environment.Variable(); - julProperty.setKey("java.util.logging.config.file"); - julProperty.setValue("logging.properties"); - javaTask.addSysproperty(julProperty); - - // We enable by default all assertions : todo make it configurable perhaps (see JDK doc about assertions) - Assertions assertions = new Assertions(); - assertions.setProject(getProject()); - assertions.addEnable(new Assertions.EnabledAssertion()); - javaTask.addAssertions(assertions); - - // Beginning of jpda option implementation, need to improve it - if (jpda) - { - Environment.Variable javaDotCompilerProperty = new Environment.Variable(); - javaDotCompilerProperty.setKey("java.compiler"); - javaDotCompilerProperty.setValue("NONE"); - javaTask.addSysproperty(javaDotCompilerProperty); - javaTask.setJvmargs("-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"); - } - // Apply task classpath if (getClasspath() != null) { @@ -152,21 +120,12 @@ } // Set system properties - for (Environment.Variable sysproperty : sysproperties) { - javaTask.addSysproperty(sysproperty); + javaTask.addSysproperty(sysproperty); } - // Set fork - if (isFork()) - { - javaTask.setFork(true); - } - - - } catch (BuildException e) { @@ -178,33 +137,25 @@ - private void addArguments(Java javaTask) + private void addArguments(JavaBuilder javaBuilder) { - javaTask.createArg().setValue(OPT_CONFIG + "=" + config); + javaBuilder.setConfig(config); if (getSuiteName() != null) { - javaTask.createArg().setValue(OPT_SUITE_NAME + "=" + getSuiteName()); + javaBuilder.setSuiteName(getSuiteName()); } if (getReports() != null && getReports().getXMLReports() != null) { - javaTask.createArg().setValue(OPT_XML_REPORT_DIR + "=" + getReports().getXMLReports().getToDir()); + javaBuilder.setXmlReportDir(getReports().getXMLReports().getToDir()); } if (getReports() != null && getReports().getHTMLReports() != null) { - javaTask.createArg().setValue(OPT_HTML_REPORT_DIR + "=" + getReports().getHTMLReports().getToDir()); + javaBuilder.setHtmlReportDir(getReports().getHTMLReports().getToDir()); } - Set<String> includeIds = new HashSet<String>(); - - Set<String> includeKeywords = new HashSet<String>(); - - Set<String> excludeIds = new HashSet<String>(); - - Set<String> excludeKeywords = new HashSet<String>(); - for (IncludeType include : includes) { //Check attributes consistency @@ -217,31 +168,18 @@ if (include.getIds() != null) { - addUnparsedString(includeIds, include.getIds()); + javaBuilder.addUnparsedIncludeIDs(include.getIds()); } if (include.getKeywords() != null) { - addUnparsedString(includeKeywords, include.getKeywords()); + javaBuilder.addUnparsedIncludeKeywords(include.getKeywords()); } if (include.getId() != null) { - addUnparsedString(includeIds, include.getId()); + javaBuilder.addUnparsedIncludeIDs(include.getId()); } } - if (includeIds.size() != 0) - { - javaTask.createArg().setValue(generateArgument(includeIds, OPT_IDS)); - } - - if (includeKeywords.size() != 0) - { - javaTask.createArg().setValue(generateArgument(includeKeywords, OPT_KEYWORDS)); - } - - -// List<TestFilter> excludeFilters = new LinkedList<TestFilter>(); - for (ExcludeType exclude : excludes) { @@ -252,357 +190,43 @@ if (exclude.getIds() != null) { - addUnparsedString(excludeIds, exclude.getIds()); + javaBuilder.addUnparsedExcludeIDs(exclude.getIds()); } if (exclude.getKeywords() != null) { - addUnparsedString(excludeKeywords, exclude.getKeywords()); + javaBuilder.addUnparsedExcludeKeywords(exclude.getKeywords()); } if (exclude.getId() != null) { - addUnparsedString(excludeIds, exclude.getId()); + javaBuilder.addUnparsedExcludeIDs(exclude.getId()); } } - if (excludeIds.size() != 0) - { - javaTask.createArg().setValue(generateArgument(excludeIds, OPT_EX_IDS)); - } + // Properties - if (excludeKeywords.size() != 0) - { - javaTask.createArg().setValue(generateArgument(excludeKeywords, OPT_EX_KEYWORDS)); - } - - if (properties.size() > 0) { - Map<String,String> taskProperties = new HashMap<String,String>(); - for (PropertyType property : properties) { - taskProperties.put(property.getName(),property.getValue()); + javaBuilder.addProperty(property.getName(),property.getValue()); } - updateProperties(taskProperties); - - - StringBuilder props = new StringBuilder("["); - - for (Iterator<String> iterator = taskProperties.keySet().iterator(); iterator.hasNext();) - { - String propertyKey = iterator.next(); - - String propertyValue = taskProperties.get(propertyKey); - - props.append(propertyKey + "=" + propertyValue); - - if (iterator.hasNext()) - { - props.append(","); - } - else - { - props.append("]"); - } - } - - javaTask.createArg().setValue(OPT_PROPERTIES + "=" + props); - + javaBuilder.updateFQNProperties((Hashtable<String,String>)getProject().getProperties()); } - Map<String,List<String>> sysParameters = new HashMap<String, List<String>>(); - Map<String,List<String>> mergedParameters = new HashMap<String, List<String>>(); + //Parameters for (ParameterType parameter : parameters) { - List<String> values; - - if (mergedParameters.containsKey(parameter.getName())) - { - values = mergedParameters.get(parameter.getName()); - } - else - { - values = new LinkedList<String>(); - } - - values.addAll(parameter.getValues()); - - mergedParameters.put(parameter.getName(), values); + javaBuilder.addParameter(parameter.getName(), parameter.getValues()); } - - updateParameters(sysParameters); - mergedParameters.putAll(sysParameters); + javaBuilder.updateFQNParameters((Hashtable<String,String>)getProject().getProperties()); - - if (!mergedParameters.isEmpty()) - { - StringBuilder params = new StringBuilder("["); - - Set<String> paramNames = mergedParameters.keySet(); - - for (Iterator<String> stringIterator = paramNames.iterator(); stringIterator.hasNext();) - { - String name = stringIterator.next(); - - - List<String> paramValues = mergedParameters.get(name); - - for (Iterator<String> iterator = paramValues.iterator(); iterator.hasNext();) - { - String value = iterator.next(); - - - params.append(name) - .append("=") - .append(value); - - if (iterator.hasNext()) - { - params.append(","); - } - } - - if (stringIterator.hasNext()) - { - params.append(","); - } - else - { - params.append("]"); - } - - } - - javaTask.createArg().setValue(OPT_PARAMETERS + "=" + params); - - } - - - - } - private void updateParameters(Map<String, List<String>> taskParameters) - { - Hashtable<String, String> sysProps = (Hashtable<String,String>)getProject().getProperties(); - - String sysParameters = sysProps.get(JBOSS_UNIT_PARAMETERS); - - if (sysParameters != null && sysParameters.length() > 0) - { - - Map<String,List<String>> parsedParams = parseParameters(sysParameters); - - taskParameters.putAll(parsedParams); - } - - for (String sysPropKey : sysProps.keySet()) - { - if (sysPropKey.startsWith(JBOSS_UNIT_PARAMETER + ".")) - { - String propertyString = sysPropKey + "=" + sysProps.get(sysPropKey); - - propertyString = propertyString.replaceFirst(JBOSS_UNIT_PARAMETER + "\\.", ""); - - - // - String[] parameter = propertyString.split("=",2); - - // - if (parameter.length != 2) - { - throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString); - } - - - List parameterValues = new LinkedList<String>(); - - if (parameter[1].matches("\\[.+(,.+)*\\]")) - { - - - - String valuesString = parameter[1]; - - valuesString = valuesString.replaceAll("\\[","").replaceAll("\\]",""); - - String[] values = valuesString.split(","); - - for (String value : values) - { - parameterValues.add(value); - } - - } - else - { - parameterValues.add(parameter[1]); - } - - if (taskParameters.containsKey(parameter[0])) - { - taskParameters.get(parameter[0]).addAll(parameterValues); - } - else - { - taskParameters.put(parameter[0], parameterValues); - } - } - } - } - - private Map<String, List<String>> parseParameters(String parametersString) - { - - if (!parametersString.matches("\\[.+=.+(,.+=.+)*\\]")) - { - throw new IllegalArgumentException("Parameters don't follow proper format: [a=b,c=d,e=f]"); - } - - Map<String,List<String>> parsedParams = new HashMap<String,List<String>>(); - - parametersString = parametersString.replaceAll("\\[","").replaceAll("\\]",""); - - String parameterGroups[] = parametersString.split(","); - - for (String parameterGroup : parameterGroups) - { - - String parameter[] = parameterGroup.split("="); - - // - if (parameter.length != 2) - { - throw new IllegalArgumentException("Parameter not accepted, it should match a=b and it is " + parameter); - } - - List<String> values; - - if (parsedParams.containsKey(parameter[0])) - { - values = parsedParams.get(parameter[0]); - } - else - { - values = new LinkedList<String>(); - } - - values.add(parameter[1]); - - parsedParams.put(parameter[0], values); - } - - return parsedParams; - - - } - - - private void addUnparsedString(Set<String> set, String valueString) - { - if (valueString == null) - { - throw new IllegalArgumentException("valueString cannot be null"); - } - String[] parsedValues = valueString.split(","); - for (String keyword : parsedValues) - { - set.add(keyword.trim()); - } - } - - private String generateArgument(Set<String> values, String argumentName) - { - - StringBuffer argument = new StringBuffer(argumentName).append("="); - for (String s : values) - { - argument.append(s).append(","); - } - // Remove last ',' - argument.deleteCharAt(argument.length() - 1); - return argument.toString(); - } - - - private void updateProperties(Map<String,String> propMap) - { - Hashtable<String, String> sysProps = (Hashtable<String,String>)getProject().getProperties(); - - - - String sysProperties = (String)sysProps.get(JBOSS_UNIT_PROPERTIES); - - if (sysProperties != null && sysProperties.length() > 0) - { - - Map<String,String> parsedProps = parseProperties(sysProperties); - - propMap.putAll(parsedProps); - } - - for (String sysPropKey : sysProps.keySet()) - { - - if (sysPropKey.startsWith(JBOSS_UNIT_PROPERTY)) - { - String propertyString = sysPropKey + "=" + sysProps.get(sysPropKey); - - propertyString = propertyString.replaceFirst(JBOSS_UNIT_PROPERTY + "\\.", ""); - - // - String[] patternValues = propertyString.split("="); - - // - if (patternValues.length != 2) - { - throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString); - } - - propMap.put(patternValues[0],patternValues[1]); - - } - - - } - - } - - public static Map<String,String> parseProperties(String propertiesString) - { - if (!propertiesString.matches("\\[.+=.+(,.+=.+)*\\]")) - { - throw new IllegalArgumentException("Properties don't follow proper format: [a=b,c=d,e=f]"); - } - - Map<String,String> parsedProps = new HashMap<String,String>(); - - propertiesString = propertiesString.replaceAll("\\[","").replaceAll("\\]",""); - - String propertyGroups[] = propertiesString.split(","); - - for (String propertyGroup : propertyGroups) - { - - String property[] = propertyGroup.split("="); - - // - if (property.length != 2) - { - throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + property); - } - - parsedProps.put(property[0],property[1]); - } - return parsedProps; - } - - public Set<Environment.Variable> getSysproperties() { return sysproperties; Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ToolingConstants.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ToolingConstants.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ToolingConstants.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,71 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public final class ToolingConstants -{ - - public static final String JBOSS_UNIT_PROPERTIES = "jboss.unit.properties"; - - public static final String JBOSS_UNIT_PROPERTY = "jboss.unit.property"; - - public static final String JBOSS_UNIT_PARAMETER = "jboss.unit.parameter"; - - public static final String JBOSS_UNIT_PARAMETERS = "jboss.unit.parameters"; - - public static final String OPT_ID = "--id"; - - public static final String OPT_IDS = "--ids"; - - public static final String OPT_KEYWORDS = "--keywords"; - - public static final String OPT_EX_ID = "--ex_id"; - - public static final String OPT_EX_IDS = "--ex_ids"; - - public static final String OPT_EX_KEYWORDS = "--ex_keywords"; - - public static final String OPT_CONFIG = "--config"; - - public static final String OPT_SUITE_NAME = "--suite_name"; - - public static final String OPT_NO_CONSOLE = "--no_console"; - - public static final String OPT_XML_REPORT_DIR = "--xml_report_dir"; - - public static final String OPT_HTML_REPORT_DIR = "--html_report_dir"; - - public static final String OPT_PROPERTY = "--property"; - - public static final String OPT_PROPERTIES = "--properties"; - - public static final String OPT_PARAMETER = "--parameter"; - - public static final String OPT_PARAMETERS = "--parameters"; - - -} Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ValueType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ValueType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ValueType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,47 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class ValueType -{ - private String value; - - public void addText(String text) - { - this.value = text; - } - - public String getValue() - { - return value; - } - - public String toString() - { - return this.value; - } -} Deleted: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/XMLReportsType.java =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/XMLReportsType.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/XMLReportsType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -1,47 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.unit.tooling.ant; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class XMLReportsType -{ - - public XMLReportsType() - { - } - - private String toDir = "."; - - public String getToDir() - { - return toDir; - } - - public void setToDir(String toDir) - { - this.toDir = toDir; - } -} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ExcludeType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ExcludeType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ExcludeType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ExcludeType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,83 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.ant.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class ExcludeType +{ + private String id; + + private String ids; + + private String idPatterns; + + private String keywords; + + + public ExcludeType() + { + } + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public String getIds() + { + return ids; + } + + public void setIds(String ids) + { + this.ids = ids; + } + + public String getIdPatterns() + { + return idPatterns; + } + +// public void setIdPatterns(String idPatterns) +// { +// this.idPatterns = idPatterns; +// } + + public String getKeywords() + { + return keywords; + } + + public void setKeywords(String keywords) + { + this.keywords = keywords; + } +} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/HTMLReportsType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/HTMLReportsType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/HTMLReportsType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/HTMLReportsType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,46 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.ant.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class HTMLReportsType +{ + public HTMLReportsType() + { + } + + private String toDir = "."; + + public String getToDir() + { + return toDir; + } + + public void setToDir(String toDir) + { + this.toDir = toDir; + } +} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/IncludeType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/IncludeType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/IncludeType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/IncludeType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,83 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.ant.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class IncludeType +{ + private String id; + + private String ids; + + private String idPatterns; + + private String keywords; + + + public IncludeType() + { + } + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public String getIds() + { + return ids; + } + + public void setIds(String ids) + { + this.ids = ids; + } + + public String getIdPatterns() + { + return idPatterns; + } + +// public void setIdPatterns(String idPatterns) +// { +// this.idPatterns = idPatterns; +// } + + public String getKeywords() + { + return keywords; + } + + public void setKeywords(String keywords) + { + this.keywords = keywords; + } +} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ParameterType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ParameterType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ParameterType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ParameterType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,89 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.ant.configuration; + +import java.util.LinkedList; +import java.util.List; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class ParameterType +{ + + private String name; + + private List<String> values = new LinkedList<String>(); + + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + ParameterType that = (ParameterType)o; + + if (!name.equals(that.name)) + { + return false; + } + + return true; + } + + public int hashCode() + { + int result; + result = name.hashCode(); + result = 31 * result + (values != null ? values.hashCode() : 0); + return result; + } + + public void addConfiguredValue(ValueType value) + { + values.add(value.toString()); + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public List<String> getValues() + { + return values; + } + + +} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/PropertyType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/PropertyType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/PropertyType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/PropertyType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,59 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.unit.tooling.ant.configuration; + +/** + * A property. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PropertyType +{ + + /** . */ + private String name; + + /** . */ + private String value; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ReportsType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ReportsType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ReportsType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ReportsType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,68 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.ant.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class ReportsType +{ + + private XMLReportsType xmlReports; + + private HTMLReportsType htmlReports; + + private boolean noConsole; + + + public boolean isNoConsole() + { + return noConsole; + } + + public void setNoConsole(boolean noConsole) + { + this.noConsole = noConsole; + } + + public void addConfiguredXml(XMLReportsType xml) + { + xmlReports = xml; + } + + public void addConfiguredHtml(HTMLReportsType html) + { + htmlReports = html; + } + + public XMLReportsType getXMLReports() + { + return xmlReports; + } + + public HTMLReportsType getHTMLReports() + { + return htmlReports; + } +} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ValueType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ValueType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ValueType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/ValueType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,47 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.ant.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class ValueType +{ + private String value; + + public void addText(String text) + { + this.value = text; + } + + public String getValue() + { + return value; + } + + public String toString() + { + return this.value; + } +} Copied: modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/XMLReportsType.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/XMLReportsType.java) =================================================================== --- modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/XMLReportsType.java (rev 0) +++ modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/configuration/XMLReportsType.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,47 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.ant.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class XMLReportsType +{ + + public XMLReportsType() + { + } + + private String toDir = "."; + + public String getToDir() + { + return toDir; + } + + public void setToDir(String toDir) + { + this.toDir = toDir; + } +} Modified: modules/test/trunk/tooling/build.xml =================================================================== --- modules/test/trunk/tooling/build.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/build.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -123,14 +123,21 @@ <target name="compile" description="Compile all source files." - depends="_default:compile-classes, + depends="_buildmagic:init,configure-defaults" + > + +  +  -  +  +  + <mkdir dir="${build.classes}"/> + <javac destdir="${build.classes}" optimize="${javac.optimize}" target="${javac.target}" @@ -142,6 +149,26 @@ includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}"> + <src path="./core/src/main/java"/> + <classpath> + <path refid="javac.classpath"/> + <pathelement location="${build.classes}"/> + </classpath> + + <include name="${javac.includes}"/> + </javac> + + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> <src path="./ant/src/main/java"/> <classpath> <path refid="javac.classpath"/> @@ -171,6 +198,19 @@ <include name="${javac.includes}"/> </javac> + +  +  +  +  +  +  +  +  +  +  +  + </target>  @@ -197,7 +237,7 @@ <fileset dir="${build.classes}"> <exclude name="org/jboss/unit/**"/> </fileset> - <fileset dir="${maven.module.test.resources}"/> + <fileset dir="./ant/src/test/resources"/> </jar> </target> Added: modules/test/trunk/tooling/core/pom.xml =================================================================== --- modules/test/trunk/tooling/core/pom.xml (rev 0) +++ modules/test/trunk/tooling/core/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,44 @@ +<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"> + <parent> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-unit-tooling-aggregator</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-unit-tooling</artifactId> + <packaging>jar</packaging> + <name>JBoss Unit Tooling</name> + + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> + + <build> + + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + + </build> + + <properties> + + </properties> +</project> \ No newline at end of file Added: modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/JavaBuilder.java =================================================================== --- modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/JavaBuilder.java (rev 0) +++ modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/JavaBuilder.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,762 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling; + +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.Assertions; +import org.apache.tools.ant.taskdefs.Java; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PROPERTIES; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PROPERTY; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PARAMETERS; +import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PARAMETER; + +import java.util.HashSet; +import java.util.Set; +import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.LinkedList; +import java.util.Hashtable; +import static org.jboss.unit.tooling.ToolingConstants.*; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class JavaBuilder +{ + + private Project antProject; + + private String config; + + private String suiteName; + + private Set<String> includeIDs = new HashSet<String>(); + + private Set<String> includeKeywords = new HashSet<String>(); + + private Set<String> excludeIDs = new HashSet<String>(); + + private Set<String> excludeKeywords = new HashSet<String>(); + + private boolean jpda = false; + + private boolean fork = true; + + private String xmlReportDir; + + private String htmlReportDir; + + private Map<String,String> properties = new HashMap<String,String>(); + + private Map<String,List<String>> parameters = new HashMap<String, List<String>>(); + + public JavaBuilder() + { + init(); + } + + public JavaBuilder(Project antProject) + { + this.antProject = antProject; + init(); + } + + private void init() + { + if (antProject == null) + { + antProject = new Project(); + antProject.init(); + } + } + + public Java buildJava() + { + Java java = (Java)antProject.createTask("java"); + + java.setClassname("org.jboss.unit.tooling.Main"); + + // Set jboss logging to use JUL + Environment.Variable pluginProperty = new Environment.Variable(); + pluginProperty.setKey("org.jboss.logging.Logger.pluginClass"); + pluginProperty.setValue("org.jboss.logging.jdk.JDK14LoggerPlugin"); + java.addSysproperty(pluginProperty); + + // Set JUL to configure using the logging.properties file found in the current dir + Environment.Variable julProperty = new Environment.Variable(); + julProperty.setKey("java.util.logging.config.file"); + julProperty.setValue("logging.properties"); + java.addSysproperty(julProperty); + + // We enable by default all assertions : todo make it configurable perhaps (see JDK doc about assertions) + Assertions assertions = new Assertions(); + assertions.setProject(antProject); + assertions.addEnable(new Assertions.EnabledAssertion()); + java.addAssertions(assertions); + + // Beginning of jpda option implementation, need to improve it + if (jpda) + { + Environment.Variable javaDotCompilerProperty = new Environment.Variable(); + javaDotCompilerProperty.setKey("java.compiler"); + javaDotCompilerProperty.setValue("NONE"); + java.addSysproperty(javaDotCompilerProperty); + java.setJvmargs("-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"); + } + + // Set fork + if (isFork()) + { + java.setFork(true); + } + + + java.createArg().setValue(OPT_CONFIG + "=" + config); + + if (getSuiteName() != null) + { + java.createArg().setValue(OPT_SUITE_NAME + "=" + getSuiteName()); + } + + if (getXmlReportDir() != null) + { + java.createArg().setValue(OPT_XML_REPORT_DIR + "=" + getXmlReportDir()); + } + + if (getHtmlReportDir() != null) + { + java.createArg().setValue(OPT_HTML_REPORT_DIR + "=" + getHtmlReportDir()); + } + + if (includeIDs.size() != 0) + { + java.createArg().setValue(generateArgument(includeIDs, OPT_IDS)); + } + + if (includeKeywords.size() != 0) + { + java.createArg().setValue(generateArgument(includeKeywords, OPT_KEYWORDS)); + } + + if (excludeIDs.size() != 0) + { + java.createArg().setValue(generateArgument(excludeIDs, OPT_EX_IDS)); + } + + if (excludeKeywords.size() != 0) + { + java.createArg().setValue(generateArgument(excludeKeywords, OPT_EX_KEYWORDS)); + } + + + if (properties.size() > 0) + { + + StringBuilder props = new StringBuilder("["); + + for (Iterator<String> iterator = properties.keySet().iterator(); iterator.hasNext();) + { + String propertyKey = iterator.next(); + + String propertyValue = properties.get(propertyKey); + + props.append(propertyKey + "=" + propertyValue); + + if (iterator.hasNext()) + { + props.append(","); + } + else + { + props.append("]"); + } + } + + java.createArg().setValue(OPT_PROPERTIES + "=" + props); + + } + + + if (!parameters.isEmpty()) + { + StringBuilder params = new StringBuilder("["); + + Set<String> paramNames = parameters.keySet(); + + for (Iterator<String> stringIterator = paramNames.iterator(); stringIterator.hasNext();) + { + String name = stringIterator.next(); + + + List<String> paramValues = parameters.get(name); + + for (Iterator<String> iterator = paramValues.iterator(); iterator.hasNext();) + { + String value = iterator.next(); + + + params.append(name) + .append("=") + .append(value); + + if (iterator.hasNext()) + { + params.append(","); + } + } + + if (stringIterator.hasNext()) + { + params.append(","); + } + else + { + params.append("]"); + } + + } + + java.createArg().setValue(OPT_PARAMETERS + "=" + params); + + } + + + + return java; + } + + + + public String getConfig() + { + return config; + } + + public void setConfig(String config) + { + if (config == null) + { + throw new IllegalArgumentException("config cannot be null"); + } + this.config = config; + } + + public String getSuiteName() + { + return suiteName; + } + + public void setSuiteName(String suiteName) + { + if (suiteName == null) + { + throw new IllegalArgumentException("suiteName cannot be null"); + } + this.suiteName = suiteName; + } + + public void addIncludeID(String id) + { + if (id == null) + { + throw new IllegalArgumentException("id cannot be null"); + } + + includeIDs.add(id); + } + + public void addUnparsedIncludeIDs(String ids) + { + if (ids == null) + { + throw new IllegalArgumentException("ids cannot be null"); + } + + addUnparsedString(getIncludeIDs(), ids); + } + + public Set<String> getIncludeIDs() + { + return includeIDs; + } + + public void setIncludeIDs(Set<String> includeIDs) + { + if (includeIDs == null) + { + throw new IllegalArgumentException("includeIDs cannot be null"); + } + + this.includeIDs = includeIDs; + } + + public void addIncludeKeyword(String keyword) + { + if (keyword == null) + { + throw new IllegalArgumentException("keyword cannot be null"); + } + + includeKeywords.add(keyword); + } + + + public void addUnparsedIncludeKeywords(String keywords) + { + if (keywords == null) + { + throw new IllegalArgumentException("keywords cannot be null"); + } + + addUnparsedString(getIncludeKeywords(), keywords); + } + + public Set<String> getIncludeKeywords() + { + return includeKeywords; + } + + public void setIncludeKeywords(Set<String> includeKeywords) + { + if ( includeKeywords == null) + { + throw new IllegalArgumentException("includeKeywords cannot be null"); + } + + this.includeKeywords = includeKeywords; + } + + public void addExcludeID(String id) + { + if (id == null) + { + throw new IllegalArgumentException("id cannot be null"); + } + + excludeIDs.add(id); + } + + public void addUnparsedExcludeIDs(String ids) + { + if (ids == null) + { + throw new IllegalArgumentException("ids cannot be null"); + } + + addUnparsedString(getExcludeIDs(), ids); + } + + public Set<String> getExcludeIDs() + { + return excludeIDs; + } + + public void setExcludeIDs(Set<String> excludeIDs) + { + if (excludeIDs == null) + { + throw new IllegalArgumentException("excludeIDs cannot be null"); + } + + this.excludeIDs = excludeIDs; + } + + public void addExcludeKeyword(String keyword) + { + if (keyword == null) + { + throw new IllegalArgumentException("keyword cannot be null"); + } + + excludeKeywords.add(keyword); + } + + public void addUnparsedExcludeKeywords(String keywords) + { + if (keywords == null) + { + throw new IllegalArgumentException("keywords cannot be null"); + } + + addUnparsedString(getExcludeKeywords(), keywords); + } + + public Set<String> getExcludeKeywords() + { + return excludeKeywords; + } + + public void setExcludeKeywords(Set<String> excludeKeywords) + { + if (excludeKeywords == null) + { + throw new IllegalArgumentException("excludeKeywords cannot be null"); + } + + this.excludeKeywords = excludeKeywords; + } + + public boolean isJpda() + { + return jpda; + } + + public void setJpda(boolean jpda) + { + this.jpda = jpda; + } + + public boolean isFork() + { + return fork; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + private void addUnparsedString(Set<String> set, String valueString) + { + if (valueString == null) + { + throw new IllegalArgumentException("valueString cannot be null"); + } + String[] parsedValues = valueString.split(","); + for (String keyword : parsedValues) + { + set.add(keyword.trim()); + } + } + + + public String getXmlReportDir() + { + return xmlReportDir; + } + + public void setXmlReportDir(String xmlReportDir) + { + this.xmlReportDir = xmlReportDir; + } + + public String getHtmlReportDir() + { + return htmlReportDir; + } + + public void setHtmlReportDir(String htmlReportDir) + { + this.htmlReportDir = htmlReportDir; + } + + public Project getAntProject() + { + return antProject; + } + + public void setAntProject(Project antProject) + { + this.antProject = antProject; + } + + public Map<String, String> getProperties() + { + return properties; + } + + public void setProperties(Map<String, String> properties) + { + this.properties = properties; + } + + public void addProperties(Map<String,String> toAdd) + { + if (toAdd == null) + { + throw new IllegalArgumentException("property map cannot be null"); + } + + properties.putAll(toAdd); + } + + + public void addProperty(String key, String value) + { + if (key == null || value == null) + { + throw new IllegalArgumentException("Key and value must not be null"); + } + + properties.put(key, value); + } + + public void updateFQNProperties(Map toUpdate) + { + + String sysProperties = (String)toUpdate.get(JBOSS_UNIT_PROPERTIES); + + if (sysProperties != null && sysProperties.length() > 0) + { + + Map<String,String> parsedProps = JavaBuilder.parseProperties(sysProperties); + + properties.putAll(parsedProps); + } + + for (Object sysPropKey : toUpdate.keySet()) + { + + if (sysPropKey.toString().startsWith(JBOSS_UNIT_PROPERTY)) + { + String propertyString = sysPropKey + "=" + toUpdate.get(sysPropKey); + + propertyString = propertyString.replaceFirst(JBOSS_UNIT_PROPERTY + "\\.", ""); + + // + String[] patternValues = propertyString.split("="); + + // + if (patternValues.length != 2) + { + throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString); + } + + properties.put(patternValues[0],patternValues[1]); + + } + + + } + + } + + public static Map<String,String> parseProperties(String propertiesString) + { + if (!propertiesString.matches("\\[.+=.+(,.+=.+)*\\]")) + { + throw new IllegalArgumentException("Properties don't follow proper format: [a=b,c=d,e=f]"); + } + + Map<String,String> parsedProps = new HashMap<String,String>(); + + propertiesString = propertiesString.replaceAll("\\[","").replaceAll("\\]",""); + + String propertyGroups[] = propertiesString.split(","); + + for (String propertyGroup : propertyGroups) + { + + String property[] = propertyGroup.split("="); + + // + if (property.length != 2) + { + throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + property); + } + + parsedProps.put(property[0],property[1]); + } + return parsedProps; + } + + public Map<String, List<String>> getParameters() + { + return parameters; + } + + public void setParameters(Map<String, List<String>> parameters) + { + this.parameters = parameters; + } + + + public void addParameters(Map<String, List<String>> toAdd) + { + + if (toAdd == null) + { + throw new IllegalArgumentException("parameter map cannot be null"); + } + + parameters.putAll(toAdd); + + } + + public void addParameter(String key, List<String> addValues) + { + + if (key == null || addValues == null) + { + throw new IllegalArgumentException("parameter key and values list cannot be null"); + } + + List<String> values; + + if (parameters.containsKey(key)) + { + values = parameters.get(key); + } + else + { + values = new LinkedList<String>(); + } + + values.addAll(addValues); + + parameters.put(key, values); + + } + + public void updateFQNParameters(Map toUpdate) + { + + Object sysParameters = toUpdate.get(JBOSS_UNIT_PARAMETERS); + + if (sysParameters != null && sysParameters.toString().length() > 0) + { + + Map<String,List<String>> parsedParams = parseParameters(sysParameters.toString()); + + + parameters.putAll(parsedParams); + } + + for (Object sysPropKey : toUpdate.keySet()) + { + if (sysPropKey.toString().startsWith(JBOSS_UNIT_PARAMETER + ".")) + { + String propertyString = sysPropKey + "=" + toUpdate.get(sysPropKey); + + propertyString = propertyString.replaceFirst(JBOSS_UNIT_PARAMETER + "\\.", ""); + + + // + String[] parameter = propertyString.split("=",2); + + // + if (parameter.length != 2) + { + throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString); + } + + + List parameterValues = new LinkedList<String>(); + + if (parameter[1].matches("\\[.+(,.+)*\\]")) + { + + + + String valuesString = parameter[1]; + + valuesString = valuesString.replaceAll("\\[","").replaceAll("\\]",""); + + String[] values = valuesString.split(","); + + for (String value : values) + { + parameterValues.add(value); + } + + } + else + { + parameterValues.add(parameter[1]); + } + + if (parameters.containsKey(parameter[0])) + { + parameters.get(parameter[0]).addAll(parameterValues); + } + else + { + parameters.put(parameter[0], parameterValues); + } + } + } + } + + private Map<String, List<String>> parseParameters(String parametersString) + { + + if (!parametersString.matches("\\[.+=.+(,.+=.+)*\\]")) + { + throw new IllegalArgumentException("Parameters don't follow proper format: [a=b,c=d,e=f]"); + } + + Map<String,List<String>> parsedParams = new HashMap<String,List<String>>(); + + parametersString = parametersString.replaceAll("\\[","").replaceAll("\\]",""); + + String parameterGroups[] = parametersString.split(","); + + for (String parameterGroup : parameterGroups) + { + + String parameter[] = parameterGroup.split("="); + + // + if (parameter.length != 2) + { + throw new IllegalArgumentException("Parameter not accepted, it should match a=b and it is " + parameter); + } + + List<String> values; + + if (parsedParams.containsKey(parameter[0])) + { + values = parsedParams.get(parameter[0]); + } + else + { + values = new LinkedList<String>(); + } + + values.add(parameter[1]); + + parsedParams.put(parameter[0], values); + } + + return parsedParams; + + + } + + private String generateArgument(Set<String> values, String argumentName) + { + + StringBuffer argument = new StringBuffer(argumentName).append("="); + for (String s : values) + { + argument.append(s).append(","); + } + // Remove last ',' + argument.deleteCharAt(argument.length() - 1); + return argument.toString(); + } +} Copied: modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/TaskExecutingThread.java) =================================================================== --- modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java (rev 0) +++ modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,50 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling; + +import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.Task; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class TaskExecutingThread extends Thread +{ + + private Task task; + + private TaskExecutingThread() + { + } + + public TaskExecutingThread(Task task) + { + this.task = task; + } + + public void run() + { + this.task.execute(); + } +} Copied: modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/ToolingConstants.java (from rev 8820, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/ToolingConstants.java) =================================================================== --- modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/ToolingConstants.java (rev 0) +++ modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/ToolingConstants.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,71 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public final class ToolingConstants +{ + + public static final String JBOSS_UNIT_PROPERTIES = "jboss.unit.properties"; + + public static final String JBOSS_UNIT_PROPERTY = "jboss.unit.property"; + + public static final String JBOSS_UNIT_PARAMETER = "jboss.unit.parameter"; + + public static final String JBOSS_UNIT_PARAMETERS = "jboss.unit.parameters"; + + public static final String OPT_ID = "--id"; + + public static final String OPT_IDS = "--ids"; + + public static final String OPT_KEYWORDS = "--keywords"; + + public static final String OPT_EX_ID = "--ex_id"; + + public static final String OPT_EX_IDS = "--ex_ids"; + + public static final String OPT_EX_KEYWORDS = "--ex_keywords"; + + public static final String OPT_CONFIG = "--config"; + + public static final String OPT_SUITE_NAME = "--suite_name"; + + public static final String OPT_NO_CONSOLE = "--no_console"; + + public static final String OPT_XML_REPORT_DIR = "--xml_report_dir"; + + public static final String OPT_HTML_REPORT_DIR = "--html_report_dir"; + + public static final String OPT_PROPERTY = "--property"; + + public static final String OPT_PROPERTIES = "--properties"; + + public static final String OPT_PARAMETER = "--parameter"; + + public static final String OPT_PARAMETERS = "--parameters"; + + +} Added: modules/test/trunk/tooling/examples/maven2/pom.xml =================================================================== --- modules/test/trunk/tooling/examples/maven2/pom.xml (rev 0) +++ modules/test/trunk/tooling/examples/maven2/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,111 @@ +<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"> + <groupId>org.jboss.portal.test</groupId> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-unit-tooling-maven2-example</artifactId> + <version>0.1</version> + <packaging>jar</packaging> + <name>bobo</name> + + <dependencies> + <dependency> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-unit</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <inherited>true</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <optimize>true</optimize> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-unit-tooling-maven2</artifactId> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>execute</goal> + </goals> + </execution> + </executions> + <configuration> + <testsuites> + <testsuite> + <config>jboss-unit.xml</config> + <includes> + <include> + <ids> + <id>testOne</id> + <id>testTwo</id> + </ids> + <keywords> + <keyword>keyword1</keyword> + <keyword>keyword2</keyword> + </keywords> + </include> + </includes> + <excludes> + <exclude> + <ids> + <id>otherTestOne</id> + <id>otherTestTwo</id> + </ids> + <keywords> + <keyword>otherKeyword1</keyword> + <keyword>otherKeyword2</keyword> + </keywords> + </exclude> + </excludes> + <parameters> + <parameter> + <name>parameter1</name> + <values> + <value>value1</value> + <value>value2</value> + </values> + </parameter> + <parameter> + <name>parameter2</name> + <values> + <value>value3</value> + <value>value4</value> + </values> + </parameter> + </parameters> + <properties> + <property> + <name>sampleProperty</name> + <value>propertyValue</value> + </property> + </properties> + </testsuite> + </testsuites> + </configuration> + </plugin> + </plugins> + + </build> + + <properties> + + </properties> +</project> \ No newline at end of file Added: modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/test/unit/tooling/TestSimple.java =================================================================== --- modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/test/unit/tooling/TestSimple.java (rev 0) +++ modules/test/trunk/tooling/examples/maven2/src/test/java/org/jboss/test/unit/tooling/TestSimple.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,47 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.test.unit.tooling; + +import org.jboss.unit.api.Assert; +import org.jboss.unit.api.pojo.annotations.Test; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class TestSimple +{ + + @Test + public void testOne() + { + Assert.assertTrue(true); + } + + @Test + public void testTwo() + { + Assert.assertFalse(false); + } + +} Added: modules/test/trunk/tooling/examples/maven2/src/test/resources/jboss-unit.xml =================================================================== --- modules/test/trunk/tooling/examples/maven2/src/test/resources/jboss-unit.xml (rev 0) +++ modules/test/trunk/tooling/examples/maven2/src/test/resources/jboss-unit.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <pojo> + <test> + <class name="org.jboss.test.unit.tooling.TestSimple"/> + </test> + </pojo> +</jboss-unit> \ No newline at end of file Added: modules/test/trunk/tooling/maven2/pom.xml =================================================================== --- modules/test/trunk/tooling/maven2/pom.xml (rev 0) +++ modules/test/trunk/tooling/maven2/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,70 @@ +<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"> + <parent> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-unit-tooling-aggregator</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-unit-tooling-maven2</artifactId> + <packaging>maven-plugin</packaging> + <name>JBoss Unit Tooling Maven2</name> + + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-unit</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-unit-tooling</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <properties/> + +</project> Added: modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java =================================================================== --- modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java (rev 0) +++ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/TestSuiteExecutor.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,277 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.maven2; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.model.Resource; +import org.apache.maven.project.MavenProject; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.types.Path; +import org.jboss.unit.tooling.JavaBuilder; +import org.jboss.unit.tooling.TaskExecutingThread; +import org.jboss.unit.tooling.maven2.configuration.CasesDescription; +import org.jboss.unit.tooling.maven2.configuration.Parameter; +import org.jboss.unit.tooling.maven2.configuration.Reports; +import org.jboss.unit.tooling.maven2.configuration.Testsuite; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.util.Arrays; +import java.util.Hashtable; +import java.util.List; +import java.util.Set; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class TestSuiteExecutor +{ + private final MavenProject project; + + private final Reports reports; + + private final Testsuite testsuite; + + private TestSuiteExecutor() + { + project = null; + reports = null; + testsuite = null; + } + + public TestSuiteExecutor(MavenProject project, Reports reports, Testsuite testsuite) + { + this.project = project; + this.reports = reports; + this.testsuite = testsuite; + } + + public void execute() + { + Java javaTask = createJavaTask(); + + System.out.println("Executing very first...."); + + try + { + System.out.println("Invoking java: " + javaTask.getCommandLine().toString()); + + + // This is really stupid workaround to the fact that maven eats whole output of invoked java task. + // Should be investigated and fixed in more proper way ... + + javaTask.setFork(true); + + File log = File.createTempFile("jboss-unit-" + System.currentTimeMillis(), "log"); + + javaTask.setOutput(log); + javaTask.setError(log); + + javaTask.setAppend(true); + javaTask.setLogError(true); + + + // Execution of jboss-unit + + TaskExecutingThread executor = new TaskExecutingThread(javaTask); + executor.run(); + + // Print the collected output + BufferedReader br = new BufferedReader(new FileReader(log)); + String line = null; + while (( line = br.readLine()) != null){ + System.out.println(line); + } + + // Cleanup + log.delete(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + private Java createJavaTask() + { + Java javaTask = null; + try + { + + JavaBuilder javaBuilder = new JavaBuilder(); + + addArguments(javaBuilder); + + javaTask = javaBuilder.buildJava(); + + + Path path = javaTask.createClasspath(); + + // Apply task classpath + + for (Artifact artifact : (Set<Artifact>)project.getArtifacts()) + { + path.createPathElement().setLocation(artifact.getFile()); + } + + for (Artifact artifact : (List<Artifact>)project.getTestArtifacts()) + { + path.createPathElement().setLocation(artifact.getFile()); + } + + for (Resource resource : (List<Resource>)project.getTestResources()) + { + path.createPathElement().setLocation(new File(resource.getDirectory())); + } + + try + { + for (String element : (List<String>)project.getTestClasspathElements()) + { + path.createPathElement().setLocation(new File(element)); + } + } + catch (DependencyResolutionRequiredException e) + { + e.printStackTrace(); + } + + } + catch (BuildException e) + { + throw new IllegalStateException("Failed to create <java> ant task: ", e); + } + + return javaTask; + } + + private void addArguments(JavaBuilder javaBuilder) + { + javaBuilder.setConfig(testsuite.getConfig()); + +// if (getSuiteName() != null) +// { +// javaBuilder.setSuiteName(getSuiteName()); +// } + + if (reports != null && reports.getXml() != null) + { + javaBuilder.setXmlReportDir(reports.getXml()); + } + + if (reports != null && reports.getHtml() != null) + { + javaBuilder.setHtmlReportDir(reports.getHtml()); + } + + for (CasesDescription include : testsuite.getIncludes()) + { + //Check attributes consistency + +// if (include.getId() != null && (include.getIds() != null || include.getKeywords() != null)) +// { +// throw new IllegalStateException("The use of <id> in <include> tag should be exclusive"); +// } + + + if (include.getIds() != null) + { + for (String id : include.getIds()) + { + javaBuilder.addIncludeID(id); + } + + } + if (include.getKeywords() != null) + { + for (String keyword : include.getKeywords()) + { + javaBuilder.addIncludeKeyword(keyword); + } + } +// if (include.getId() != null) +// { +// javaBuilder.addIncludeID(include.getId()); +// } + } + + for (CasesDescription exclude : testsuite.getExcludes()) + { + +// if (exclude.getId() != null && (exclude.getIds() != null || exclude.getKeywords() != null)) +// { +// throw new IllegalStateException("The use of <id> in <exclude> tag should be exclusive"); +// } + + if (exclude.getIds() != null) + { + for (String id : exclude.getIds()) + { + javaBuilder.addExcludeID(id); + } + + } + if (exclude.getKeywords() != null) + { + for (String keyword : exclude.getKeywords()) + { + javaBuilder.addExcludeKeyword(keyword); + } + } +// if (exclude.getId() != null) +// { +// javaBuilder.addIncludeID(exclude.getId()); +// } + } + + // Properties + + if (testsuite.getProperties().size() > 0) + { + + for (Object propertyName : testsuite.getProperties().keySet()) + { + javaBuilder.addProperty(propertyName.toString(),testsuite.getProperties().get(propertyName).toString()); + } + + javaBuilder.updateFQNProperties(project.getProperties()); + } + + + + //Parameters + + for (Parameter parameter : testsuite.getParameters()) + { + javaBuilder.addParameter(parameter.getName(), Arrays.asList(parameter.getValues())); + } + + javaBuilder.updateFQNParameters(project.getProperties()); + + + } +} Added: modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java =================================================================== --- modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java (rev 0) +++ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,72 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.maven2; + +import org.apache.maven.model.Dependency; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.project.MavenProject; +import org.jboss.unit.tooling.maven2.configuration.Reports; +import org.jboss.unit.tooling.maven2.configuration.Testsuite; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @goal execute + * @version : 0.1 $ + */ +public class UnitMojo extends AbstractMojo +{ + /** + * @parameter + */ + private Testsuite[] testsuites; + + /** + * @parameter + */ + private Reports reports; + + /** + * The Maven project object + * + * @parameter expression="${project}" + */ + private MavenProject project; + + + public void execute() + throws MojoExecutionException + { + + //Invoke all configured testsuites + + for (Testsuite testsuite : testsuites) + { + TestSuiteExecutor executor = new TestSuiteExecutor(project, reports, testsuite); + executor.execute(); + } + + } + + +} Added: modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/CasesDescription.java =================================================================== --- modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/CasesDescription.java (rev 0) +++ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/CasesDescription.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,51 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.maven2.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CasesDescription +{ + + /** + * @parameter + */ + private String[] ids; + + /** + * @parameter + */ + private String[] keywords; + + public String[] getIds() + { + return ids; + } + + public String[] getKeywords() + { + return keywords; + } +} Added: modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Parameter.java =================================================================== --- modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Parameter.java (rev 0) +++ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Parameter.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,50 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.maven2.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class Parameter +{ + /** + * @parameter + */ + private String name; + + /** + * @parameter + */ + private String[] values; + + public String getName() + { + return name; + } + + public String[] getValues() + { + return values; + } +} Added: modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Reports.java =================================================================== --- modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Reports.java (rev 0) +++ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Reports.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,52 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.maven2.configuration; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class Reports +{ + /** + * @parameter + */ + private String xml; + + + /** + * @parameter + */ + private String html; + + + public String getXml() + { + return xml; + } + + public String getHtml() + { + return html; + } +} Added: modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Testsuite.java =================================================================== --- modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Testsuite.java (rev 0) +++ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/configuration/Testsuite.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -0,0 +1,90 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.unit.tooling.maven2.configuration; + +import java.util.Properties; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class Testsuite +{ + + /** + * @parameter + */ + private String config; + + /** + * @parameter + */ + private CasesDescription[] includes; + + /** + * @parameter + */ + private CasesDescription[] excludes; + + /** + * @parameter + */ + private Properties properties; + + /** + * @parameter + */ + private Parameter[] parameters; + + + + public String getConfig() + { + return config; + } + + public void setConfig(String config) + { + this.config = config; + } + + public CasesDescription[] getIncludes() + { + return includes; + } + + public CasesDescription[] getExcludes() + { + return excludes; + } + + public Properties getProperties() + { + return properties; + } + + public Parameter[] getParameters() + { + return parameters; + } +} Modified: modules/test/trunk/tooling/pom.xml =================================================================== --- modules/test/trunk/tooling/pom.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/tooling/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -7,11 +7,13 @@ <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-modules-test-tooling</artifactId> + <artifactId>jboss-unit-tooling-aggregator</artifactId> <packaging>pom</packaging> - <name>JBoss Portal Modules Test Tooling</name> + <name>JBoss Unit Tooling (aggregator)</name> <modules> + <module>core</module> <module>ant</module> + <module>maven2</module> </modules> </project> Modified: modules/test/trunk/unit/pom.xml =================================================================== --- modules/test/trunk/unit/pom.xml 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/unit/pom.xml 2007-11-05 09:52:33 UTC (rev 8826) @@ -6,9 +6,9 @@ <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-modules-test-unit</artifactId> + <artifactId>jboss-unit</artifactId> <packaging>jar</packaging> - <name>JBoss Portal Modules Test Portal</name> + <name>JBoss Unit</name> <dependencies/> Modified: modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/MainBuilder.java =================================================================== --- modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/MainBuilder.java 2007-11-03 15:14:20 UTC (rev 8825) +++ modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/MainBuilder.java 2007-11-05 09:52:33 UTC (rev 8826) @@ -38,6 +38,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.io.FileNotFoundException; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; @@ -482,8 +483,25 @@ { - InputStream in;// = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile); - in = new FileInputStream(configFile); + InputStream in; + + try + { + in = new FileInputStream(configFile); + } + catch (FileNotFoundException e) + { + + // If file was not found try to obtain it from context class loader + + in = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile); + } + + if (in == null) + { + throw new IllegalArgumentException("Could not find specified file in classpath: " + configFile); + } + InputSource source = new InputSource(in); ModelBuilder builder = new ModelBuilder(source); TestSuiteDef suite = builder.build();

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8825 - in branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate: portal and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-03 11:14:20 -0400 (Sat, 03 Nov 2007) New Revision: 8825 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml Log: Setting hbm2ddl to "update" so that it can works with a database schema produced in earlier releases. "update" is not safe to all database though, and then is risky. In this case it is done in order to add 2 new tables without modifying the existing tables. Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2007-11-03 03:38:54 UTC (rev 8824) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2007-11-03 15:14:20 UTC (rev 8825) @@ -31,6 +31,7 @@ <property name="show_sql">@portal.sql.show@</property> <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + <property name="hibernate.hbm2ddl.auto">update</property> <!-- | Uncomment in clustered mode : use transactional replicated cache Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2007-11-03 03:38:54 UTC (rev 8824) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2007-11-03 15:14:20 UTC (rev 8825) @@ -31,7 +31,7 @@ <property name="show_sql">@portal.sql.show@</property> <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> - + <property name="hibernate.hbm2ddl.auto">update</property> <!-- | Uncomment in clustered mode : use transactional replicated cache @portal.single.xml.close@

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8824 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-11-02 23:38:54 -0400 (Fri, 02 Nov 2007) New Revision: 8824 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml Log: - JBPORTAL-1758: Fixed comparator to fall back to portlet id if there is no display name. - Unified handling of portlet name by making AdminPropertyResolver smarter about resolving portlet.name. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-11-02 15:06:54 UTC (rev 8823) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-11-03 03:38:54 UTC (rev 8824) @@ -117,9 +117,7 @@ public Object getValue(Object bean) { LocalizedString string = (LocalizedString)bean; - FacesContext ctx = FacesContext.getCurrentInstance(); - Locale locale = ctx.getExternalContext().getRequestLocale(); - return string.getString(locale, true); + return getValueForRequestLocale(string); } }); registerDecorator(LocalizedString.class, localizedStringDecorator); @@ -131,10 +129,12 @@ public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - return portlet.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); + String displayName = getValueForRequestLocale(portlet.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME)); + + return displayName != null ? displayName : portlet.getContext().getId(); } }); - portletDecorator.setProperty("description", new AbstractPropertyDecorator(String.class) + portletDecorator.setProperty("description", new AbstractPropertyDecorator(LocalizedString.class) { public Object getValue(Object bean) throws IllegalArgumentException { @@ -142,7 +142,7 @@ return portlet.getInfo().getMeta().getMetaValue(MetaInfo.DESCRIPTION); } }); - portletDecorator.setProperty("keywords", new AbstractPropertyDecorator(String.class) + portletDecorator.setProperty("keywords", new AbstractPropertyDecorator(LocalizedString.class) { public Object getValue(Object bean) throws IllegalArgumentException { @@ -150,7 +150,7 @@ return portlet.getInfo().getMeta().getMetaValue(MetaInfo.KEYWORDS); } }); - portletDecorator.setProperty("title", new AbstractPropertyDecorator(String.class) + portletDecorator.setProperty("title", new AbstractPropertyDecorator(LocalizedString.class) { public Object getValue(Object bean) throws IllegalArgumentException { @@ -158,7 +158,7 @@ return portlet.getInfo().getMeta().getMetaValue(MetaInfo.TITLE); } }); - portletDecorator.setProperty("remotable", new AbstractPropertyDecorator(String.class) + portletDecorator.setProperty("remotable", new AbstractPropertyDecorator(Boolean.class) { public Object getValue(Object bean) throws IllegalArgumentException { @@ -436,6 +436,13 @@ registerDecorator(ThemeService.class, themeServiceDecorator); } + private String getValueForRequestLocale(LocalizedString string) + { + FacesContext ctx = FacesContext.getCurrentInstance(); + Locale locale = ctx.getExternalContext().getRequestLocale(); + return string.getString(locale, true); + } + private static class PortletIconPropertyDecorator extends AbstractPropertyDecorator { private String iconType; Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-11-02 15:06:54 UTC (rev 8823) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-11-03 03:38:54 UTC (rev 8824) @@ -24,6 +24,7 @@ import org.jboss.logging.Logger; import org.jboss.portal.Mode; +import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; @@ -417,7 +418,10 @@ portletInvokerItems = null; } - /** A comparator for portlets. Order portlets in the alphabetical order of their display name. */ + /** + * A comparator for portlets. Order portlets in the alphabetical order of their display name. If there is no display + * name, fall back to portlet id. + */ final Comparator comparator = new Comparator() { FacesContext ctx = FacesContext.getCurrentInstance(); @@ -427,16 +431,28 @@ { Portlet p1 = (Portlet)o1; Portlet p2 = (Portlet)o2; - String p1Name = p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getString(locale, true); - if (p1Name == null) + String p1Name; + String p2Name; + LocalizedString displayName1 = p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); + LocalizedString displayName2 = p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); + + if (displayName1 != null && displayName2 != null) { - p1Name = p1.getContext().getId(); + p1Name = displayName1.getString(locale, true); + p2Name = displayName2.getString(locale, true); + + if (p1Name == null || p2Name == null) + { + p1Name = p1.getContext().getId(); + p2Name = p2.getContext().getId(); + } } - String p2Name = p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getString(locale, true); - if (p2Name == null) + else { + p1Name = p1.getContext().getId(); p2Name = p2.getContext().getId(); } + return p1Name.compareToIgnoreCase(p2Name); } }; Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-11-02 15:06:54 UTC (rev 8823) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-11-03 03:38:54 UTC (rev 8824) @@ -12,7 +12,7 @@ action="#{portletmgr.selectPortlet}"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="manager"/> - #{portlet.name.value} + #{portlet.name} </h:commandLink></h:form></td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-02 15:06:54 UTC (rev 8823) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-03 03:38:54 UTC (rev 8824) @@ -48,9 +48,7 @@ title="#{portlet.context.id}"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="manager"/> - <h:outputText - rendered="#{not empty portlet.name.value}">#{portlet.name.value}</h:outputText> - <h:outputText title="#{portlet.context.id}" rendered="#{empty portlet.name.value}">#{portlet.context.id}</h:outputText> + #{portlet.name} </h:commandLink> </td> <td>#{portlet.description.value}</td> @@ -98,7 +96,7 @@ </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - #{portletmgr.selectedPortlet.name.value} details + #{portletmgr.selectedPortlet.name} details </li> </ul> </h:form> @@ -117,7 +115,7 @@ </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - #{portletmgr.selectedPortlet.name.value} preferences + #{portletmgr.selectedPortlet.name} preferences </li> </ul> </h:form> @@ -136,7 +134,7 @@ </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - #{portletmgr.selectedPortlet.name.value} instance creation + #{portletmgr.selectedPortlet.name} instance creation </li> </ul> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-02 15:06:54 UTC (rev 8823) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-03 03:38:54 UTC (rev 8824) @@ -29,7 +29,7 @@ class="#{portlet.context.id == newWindowWizard.selectedPortletId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> <td title="#{portlet.description.value}"> <h:commandLink action="#{newWindowWizard.selectPortlet}"> - <h:outputText>#{!empty portlet.name.value ? portlet.name.value : "Unnamed"}</h:outputText> + <h:outputText>#{portlet.name}</h:outputText> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="portletInvokerId" value="#{portletmgr.selectedPortletInvokerId}"/> </h:commandLink></td>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8823 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-02 11:06:54 -0400 (Fri, 02 Nov 2007) New Revision: 8823 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml Log: Oups Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2007-11-02 14:27:24 UTC (rev 8822) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2007-11-02 15:06:54 UTC (rev 8823) @@ -105,7 +105,7 @@ column="LISTENER"/> <map name="displayNames" - table="JBP_INSTANCE_DISPLAY_NAMES"> + table="JBP_PORTAL_OBJECT_DNAMES"> <key column="INSTANCE_PK"/> <map-key type="locale" column="LOCALE"/> <element type="string" column="TEXT"/>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8822 - in branches/JBoss_Portal_Branch_2_6/core/src: main/org/jboss/portal/core/impl/model/portal and 3 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-02 10:27:24 -0400 (Fri, 02 Nov 2007) New Revision: 8822 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml Log: JBPORTAL-1736: Adding display name to Portal Objects Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-11-02 14:11:31 UTC (rev 8821) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-11-02 14:27:24 UTC (rev 8822) @@ -25,6 +25,7 @@ import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; +import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.i18n.SimpleResourceBundleFactory; import org.jboss.portal.common.path.RelativePathParser; @@ -168,8 +169,18 @@ } public String getDisplayName(Locale locale) - { - // Lazyly compute the display name + { + LocalizedString ldisplayName = object.getDisplayName(); + if (ldisplayName != null) + { + String result = ldisplayName.getString(locale, true); + if (result != null) + { + return result; + } + } + + // Lazily compute the display name if (displayNameKey == null) { displayNameKey = RESOURCE_PREFIX + object.getName(); Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-11-02 14:11:31 UTC (rev 8821) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-11-02 14:27:24 UTC (rev 8822) @@ -22,13 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.portal; -import org.jboss.logging.Logger; -import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; -import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; -import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.jems.hibernate.ContextObject; -import org.jboss.portal.security.RoleSecurityBinding; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -37,6 +30,13 @@ import java.util.Map; import java.util.Set; +import org.jboss.logging.Logger; +import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; +import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; +import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.jems.hibernate.ContextObject; +import org.jboss.portal.security.RoleSecurityBinding; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -68,7 +68,7 @@ this.path = null; this.name = null; this.children = null; - this.children = null; + this.securityConstraints = null; } public ObjectNode(AbstractPortalObjectContainer.ContainerContext containerContext, PortalObjectId path, String name) Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-02 14:11:31 UTC (rev 8821) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-02 14:27:24 UTC (rev 8822) @@ -22,18 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.portal; -import org.apache.log4j.Logger; -import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; -import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.PortalObjectId; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.Locale; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; @@ -41,6 +35,14 @@ import java.util.TreeMap; import java.util.TreeSet; +import org.apache.log4j.Logger; +import org.jboss.portal.common.NotYetImplemented; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; +import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; +import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PortalObjectId; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -65,6 +67,9 @@ /** . */ private String listener; + /** . */ + private Map displayNames; + /** The node. */ private ObjectNode objectNode; @@ -135,7 +140,21 @@ { return objectNode.getName(); } + + public void setDisplayNames(Map displayNames) + { + this.displayNames = displayNames; + } + + public Map getDisplayNames() + { + return displayNames; + } + public LocalizedString getDisplayName() + { + return new LocalizedString(displayNames, Locale.ENGLISH); + } public PortalObject copy(PortalObject parent, String name, boolean deep) throws DuplicatePortalObjectException, IllegalArgumentException { Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-11-02 14:11:31 UTC (rev 8821) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-11-02 14:27:24 UTC (rev 8822) @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.Map; +import org.jboss.portal.common.i18n.LocalizedString; + /** * The base interface for all portal objects. * @@ -84,8 +86,22 @@ * @return the object name */ String getName(); + + /** + * Return the localized string used to represent that object. + * + * @return the localized display name + */ + LocalizedString getDisplayName(); /** + * Set the localized string used to represent that object. + * + * @param the localized display name + */ + void setDisplayNames(Map localizedString); + + /** * Returns the listener id or null if there is none. * * @return the listener Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-11-02 14:11:31 UTC (rev 8821) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-11-02 14:27:24 UTC (rev 8822) @@ -22,7 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.metadata; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import org.jboss.logging.Logger; +import org.jboss.portal.common.i18n.LocaleFormat; +import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; @@ -37,11 +45,6 @@ import org.jboss.portal.security.spi.provider.SecurityConfigurationException; import org.w3c.dom.Element; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -56,6 +59,7 @@ private Map properties; private Map children; private SecurityConstraintsMetaData securityConstraints; + private Map displayNames; public PortalObjectMetaData() { @@ -102,6 +106,16 @@ { this.children = children; } + + public void setDisplayNames(Map displayNames) + { + this.displayNames = displayNames; + } + + public Map getDisplayNames() + { + return displayNames; + } public SecurityConstraintsMetaData getSecurityConstraints() { @@ -162,6 +176,9 @@ // Configure listener object.setListener(listener); + + // Configure display name + object.setDisplayNames(displayNames); // Configure security SecurityConstraintsMetaData securityConstraints = getSecurityConstraints(); @@ -248,6 +265,8 @@ { buildListenerMetaData(portalObjectMD, listenerElt); } + + buildDisplayNameMetaData(portalObjectMD, portalObjectElt); } return portalObjectMD; } @@ -267,6 +286,34 @@ portalObjectMD.getProperties().put(name, value); } } + + public static void buildDisplayNameMetaData(PortalObjectMetaData portalObjectMD, Element portalObjectElt) + { + Iterator displayNamesIt = XMLTools.getChildrenIterator(portalObjectElt, "display-name"); + + // Configure localized display-name + Map localizedStringValues = new HashMap(); + while (displayNamesIt.hasNext()) + { + Element element = (Element)displayNamesIt.next(); + String lang = element.getAttribute("xml:lang"); + Locale locale; + try + { + locale = LocaleFormat.DEFAULT.getLocale(lang); + localizedStringValues.put(locale, element.getTextContent()); + } + catch (ConversionException e) + { + log.error("Cannot set localized display-name, for language: " + lang, e); + } + } + if (localizedStringValues.size() != 0) + { + portalObjectMD.setDisplayNames(localizedStringValues); + } + } + public static void buildListenerMetaData(PortalObjectMetaData portalObjectMD, Element listenerElt) { Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2007-11-02 14:11:31 UTC (rev 8821) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2007-11-02 14:27:24 UTC (rev 8822) @@ -62,7 +62,7 @@ type="org.jboss.portal.jems.hibernate.MagicString" column="NAME"/> <one-to-many class="org.jboss.portal.core.impl.model.portal.ObjectNode"/> - </map> + </map> <many-to-one name="parent" column="PARENT_KEY" @@ -104,6 +104,13 @@ name="listener" column="LISTENER"/> <map + name="displayNames" + table="JBP_INSTANCE_DISPLAY_NAMES"> + <key column="INSTANCE_PK"/> + <map-key type="locale" column="LOCALE"/> + <element type="string" column="TEXT"/> + </map> + <map name="declaredPropertyMap" cascade="all-delete-orphan" table="JBP_PORTAL_OBJECT_PROPS"

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8821 - branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-02 10:11:31 -0400 (Fri, 02 Nov 2007) New Revision: 8821 Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml Log: message (with no s) Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-11-02 13:29:42 UTC (rev 8820) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-11-02 14:11:31 UTC (rev 8821) @@ -15,7 +15,7 @@ </ui:define> <ui:define name="content"> - <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:panelGrid columns="2">

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8820 - in modules/test/trunk/tooling: ant and 8 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-11-02 09:29:42 -0400 (Fri, 02 Nov 2007) New Revision: 8820 Added: modules/test/trunk/tooling/ant/ modules/test/trunk/tooling/ant/pom.xml modules/test/trunk/tooling/ant/src/ modules/test/trunk/tooling/maven2/ modules/test/trunk/tooling/maven2/src/ modules/test/trunk/tooling/maven2/src/main/ modules/test/trunk/tooling/maven2/src/main/java/ modules/test/trunk/tooling/maven2/src/main/java/org/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/ modules/test/trunk/tooling/maven2/src/main/resources/ Removed: modules/test/trunk/tooling/src/ Modified: modules/test/trunk/tooling/build.xml modules/test/trunk/tooling/pom.xml Log: tooling reorg for mvn Added: modules/test/trunk/tooling/ant/pom.xml =================================================================== --- modules/test/trunk/tooling/ant/pom.xml (rev 0) +++ modules/test/trunk/tooling/ant/pom.xml 2007-11-02 13:29:42 UTC (rev 8820) @@ -0,0 +1,49 @@ +<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"> + <parent> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-portal-modules-test-tooling</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-portal-modules-test-tooling-ant</artifactId> + <packaging>jar</packaging> + <name>JBoss Portal Modules Test Tooling Ant</name> + + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-portal-modules-test-unit</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + + </build> + + <properties> + + </properties> +</project> \ No newline at end of file Copied: modules/test/trunk/tooling/ant/src (from rev 8819, modules/test/trunk/tooling/src) Modified: modules/test/trunk/tooling/build.xml =================================================================== --- modules/test/trunk/tooling/build.xml 2007-11-02 09:37:03 UTC (rev 8819) +++ modules/test/trunk/tooling/build.xml 2007-11-02 13:29:42 UTC (rev 8820) @@ -142,7 +142,7 @@ includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}"> - <src path="${maven.module.test.sources}"/> + <src path="./ant/src/main/java"/> <classpath> <path refid="javac.classpath"/> <pathelement location="${build.classes}"/> @@ -151,6 +151,26 @@ <include name="${javac.includes}"/> </javac> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="./ant/src/test/java"/> + <classpath> + <path refid="javac.classpath"/> + <pathelement location="${build.classes}"/> + </classpath> + + <include name="${javac.includes}"/> + </javac> + </target>  @@ -241,7 +261,7 @@ <jboss-unit> - <tests config="./src/test/resources/simple-tests.xml" suiteName="one"> + <tests config="./ant/src/test/resources/simple-tests.xml" suiteName="one">   <property name="propName" value="propValue"/> @@ -261,7 +281,7 @@ <exclude id="otherTestTwo"/> </tests> - <tests config="./src/test/resources/assertkeyword-unit.xml"> + <tests config="./ant/src/test/resources/assertkeyword-unit.xml"> </tests> <!--<tests config="./output/resources/test/simple-tests.xml"> Modified: modules/test/trunk/tooling/pom.xml =================================================================== --- modules/test/trunk/tooling/pom.xml 2007-11-02 09:37:03 UTC (rev 8819) +++ modules/test/trunk/tooling/pom.xml 2007-11-02 13:29:42 UTC (rev 8820) @@ -1,49 +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"> - <parent> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> <groupId>org.jboss.portal.test</groupId> <artifactId>jboss-portal-modules-test-root</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-modules-test-tooling</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Test Tooling</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-portal-modules-test-tooling</artifactId> + <packaging>pom</packaging> + <name>JBoss Portal Modules Test Tooling</name> + <modules> + <module>ant</module> + </modules> +</project> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.test</groupId> - <artifactId>jboss-portal-modules-test-unit</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - - </build> - - <properties> - - </properties> -</project> \ No newline at end of file

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8819 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-02 05:37:03 -0400 (Fri, 02 Nov 2007) New Revision: 8819 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd Log: Add display-name to the DTD Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd 2007-11-01 23:56:25 UTC (rev 8818) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd 2007-11-02 09:37:03 UTC (rev 8819) @@ -74,7 +74,7 @@ </instance> --> -<!ELEMENT instance (instance-id,portlet-ref,preferences?,security-constraint?)> +<!ELEMENT instance (instance-id,portlet-ref,display-name*,preferences?,security-constraint?)>  +<!ELEMENT display-name (#PCDATA)> +<!ATTLIST display-name + xml:lang NMTOKEN #IMPLIED +> + + <!ELEMENT preferences (preference)>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8818 - in modules/common/trunk: common and 2 other directories.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-11-01 19:56:25 -0400 (Thu, 01 Nov 2007) New Revision: 8818 Modified: modules/common/trunk/common/pom.xml modules/common/trunk/mc/pom.xml modules/common/trunk/pom.xml modules/common/trunk/portal/pom.xml Log: added source generation plugin Modified: modules/common/trunk/common/pom.xml =================================================================== --- modules/common/trunk/common/pom.xml 2007-11-01 16:01:21 UTC (rev 8817) +++ modules/common/trunk/common/pom.xml 2007-11-01 23:56:25 UTC (rev 8818) @@ -142,6 +142,10 @@ </plugin> <plugin> + <artifactId>maven-source-plugin</artifactId> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> Modified: modules/common/trunk/mc/pom.xml =================================================================== --- modules/common/trunk/mc/pom.xml 2007-11-01 16:01:21 UTC (rev 8817) +++ modules/common/trunk/mc/pom.xml 2007-11-01 23:56:25 UTC (rev 8818) @@ -32,8 +32,15 @@ </dependencies> - <build/> + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + </plugin> + </plugins> + </build> + <properties/> </project> \ No newline at end of file Modified: modules/common/trunk/pom.xml =================================================================== --- modules/common/trunk/pom.xml 2007-11-01 16:01:21 UTC (rev 8817) +++ modules/common/trunk/pom.xml 2007-11-01 23:56:25 UTC (rev 8818) @@ -103,6 +103,17 @@ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot> </configuration> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build> Modified: modules/common/trunk/portal/pom.xml =================================================================== --- modules/common/trunk/portal/pom.xml 2007-11-01 16:01:21 UTC (rev 8817) +++ modules/common/trunk/portal/pom.xml 2007-11-01 23:56:25 UTC (rev 8818) @@ -13,9 +13,11 @@ <dependencies/> <build> - - <plugins/> - + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + </plugin> + </plugins> </build> <properties>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8817 - modules/common/trunk/common/src/main/java/org/jboss/portal/common/text.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-01 12:01:21 -0400 (Thu, 01 Nov 2007) New Revision: 8817 Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/text/FastURLDecoder.java Log: Fix FastURLDecoder Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/text/FastURLDecoder.java =================================================================== --- modules/common/trunk/common/src/main/java/org/jboss/portal/common/text/FastURLDecoder.java 2007-11-01 13:48:13 UTC (rev 8816) +++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/text/FastURLDecoder.java 2007-11-01 16:01:21 UTC (rev 8817) @@ -22,6 +22,11 @@ ******************************************************************************/ package org.jboss.portal.common.text; +import java.io.StringWriter; +import java.io.Writer; + +import org.jboss.portal.common.io.WriterCharWriter; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -244,39 +249,12 @@ */ public String encode(String s) throws IllegalArgumentException { - StringBuilder tmp = new StringBuilder(); - encode(s, tmp); - return tmp.toString(); + Writer sw = new StringWriter(); + CharWriter charWriter = new WriterCharWriter(sw); + encodeNoCheck(s.toCharArray(), 0, s.length(), charWriter); + return sw.toString(); } - - /** - * @param s - * @param out - * @throws IllegalArgumentException - * @since 1.1 - */ - public void encode(String s, StringBuilder out) throws IllegalArgumentException - { - if (s == null) - { - throw new IllegalArgumentException(); - } - if (out == null) - { - throw new IllegalArgumentException(); - } - for (int i = 0; i < s.length(); i++) - { - char c = s.charAt(i); - int[] z = conversions[c]; - if (z == null) - { - throw new MalformedInputException("Cannot encode char=" + (int)c); - } - out.append(z); - } - } - + private void encodeNoCheck(char[] chars, int i, int length, CharWriter tmp) { while (i < length)

18 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits November 2007