JBoss Tools SVN: r23021 - in trunk/seam: plugins and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-24 20:03:01 -0400 (Thu, 24 Jun 2010)
New Revision: 23021
Modified:
trunk/seam/features/pom.xml
trunk/seam/plugins/pom.xml
Log:
unnecessary parent pom reference removed
Modified: trunk/seam/features/pom.xml
===================================================================
--- trunk/seam/features/pom.xml 2010-06-24 23:35:49 UTC (rev 23020)
+++ trunk/seam/features/pom.xml 2010-06-25 00:03:01 UTC (rev 23021)
@@ -1,12 +1,6 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <relativePath>../../parent-pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<groupId>org.jboss.tools.seam</groupId>
<artifactId>features</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: trunk/seam/plugins/pom.xml
===================================================================
--- trunk/seam/plugins/pom.xml 2010-06-24 23:35:49 UTC (rev 23020)
+++ trunk/seam/plugins/pom.xml 2010-06-25 00:03:01 UTC (rev 23021)
@@ -1,12 +1,6 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <relativePath>../../parent-pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<groupId>org.jboss.tools.seam</groupId>
<artifactId>plugins</artifactId>
<name>seam.plugins</name>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23020 - trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-24 19:35:49 -0400 (Thu, 24 Jun 2010)
New Revision: 23020
Modified:
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java
Log:
fix JUnit error in org.jboss.tools.jst.text.ext.test.JsfExtAllTests
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java 2010-06-24 23:29:31 UTC (rev 23019)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java 2010-06-24 23:35:49 UTC (rev 23020)
@@ -1,27 +1,22 @@
package org.jboss.tools.jst.text.ext.test;
import junit.framework.Test;
+import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-
-
-public class JsfExtAllTests {
+public class JsfExtAllTests extends TestCase{
// all tests were moved to jst.ui.test plugin
public void testJsfTextExt () {
}
-// public static Test suite() {
-// TestSuite suite = new TestSuite("Test for default package");
-// //$JUnit-BEGIN$
-//
-// suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class),
-// "org.jboss.tools.jst.text.ext.test",
-// new String[]{"projects/HiperlinksTestProject"},
-// new String[]{"HiperlinksTestProject"}));
-//
-// //$JUnit-END$
-// return suite;
-// }
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for default package");
+ //$JUnit-BEGIN$
+
+ suite.addTestSuite(JsfExtAllTests.class);
+
+ //$JUnit-END$
+ return suite;
+ }
}
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23019 - in trunk/seam/tests: org.jboss.tools.seam220GA.ui.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-24 19:29:31 -0400 (Thu, 24 Jun 2010)
New Revision: 23019
Modified:
trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
Log:
<skip>false</skip> removed from pom.xml to make tests skippable
Modified: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-24 23:26:00 UTC (rev 23018)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-24 23:29:31 UTC (rev 23019)
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
Modified: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-24 23:26:00 UTC (rev 23018)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-24 23:29:31 UTC (rev 23019)
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23018 - in trunk/seam: features and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-24 19:26:00 -0400 (Thu, 24 Jun 2010)
New Revision: 23018
Modified:
trunk/seam/features/pom.xml
trunk/seam/plugins/pom.xml
trunk/seam/pom.xml
trunk/seam/site/pom.xml
trunk/seam/tests/pom.xml
Log:
group namesa and artifact ids were adjusted to create hierarchy structure in maven repository instead of flat one
Modified: trunk/seam/features/pom.xml
===================================================================
--- trunk/seam/features/pom.xml 2010-06-24 23:23:10 UTC (rev 23017)
+++ trunk/seam/features/pom.xml 2010-06-24 23:26:00 UTC (rev 23018)
@@ -7,13 +7,14 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>seam.features</artifactId>
+ <groupId>org.jboss.tools.seam</groupId>
+ <artifactId>features</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>seam.features</name>
<modules>
<module>org.jboss.tools.seam.feature</module>
<module>org.jboss.tools.seam.test.feature</module>
</modules>
</project>
-
\ No newline at end of file
+
Modified: trunk/seam/plugins/pom.xml
===================================================================
--- trunk/seam/plugins/pom.xml 2010-06-24 23:23:10 UTC (rev 23017)
+++ trunk/seam/plugins/pom.xml 2010-06-24 23:26:00 UTC (rev 23018)
@@ -7,8 +7,9 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>seam.plugins</artifactId>
+ <groupId>org.jboss.tools.seam</groupId>
+ <artifactId>plugins</artifactId>
+ <name>seam.plugins</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -22,4 +23,4 @@
<module>org.jboss.tools.seam.xml.ui</module>
</modules>
</project>
-
\ No newline at end of file
+
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2010-06-24 23:23:10 UTC (rev 23017)
+++ trunk/seam/pom.xml 2010-06-24 23:26:00 UTC (rev 23018)
@@ -1,21 +1,17 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" 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/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <relativePath>../parent-pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<groupId>org.jboss.tools</groupId>
- <artifactId>seam.all</artifactId>
+ <artifactId>seam</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
+ <module>site</module>
+ </modules>
</project>
Modified: trunk/seam/site/pom.xml
===================================================================
--- trunk/seam/site/pom.xml 2010-06-24 23:23:10 UTC (rev 23017)
+++ trunk/seam/site/pom.xml 2010-06-24 23:26:00 UTC (rev 23018)
@@ -6,8 +6,9 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>seam.site</artifactId>
+ <groupId>org.jboss.tools.seam</groupId>
+ <artifactId>site</artifactId>
+ <name>seam.site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
Modified: trunk/seam/tests/pom.xml
===================================================================
--- trunk/seam/tests/pom.xml 2010-06-24 23:23:10 UTC (rev 23017)
+++ trunk/seam/tests/pom.xml 2010-06-24 23:26:00 UTC (rev 23018)
@@ -1,14 +1,9 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <relativePath>../../parent-pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>seam.tests</artifactId>
+ <groupId>org.jboss.tools.seam</groupId>
+ <artifactId>tests</artifactId>
+ <name>seam.tests</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -28,6 +23,7 @@
<module>org.jboss.tools.seam220CR1.ui.test</module>
<module>org.jboss.tools.seam220GA.ui.test</module>
<module>org.jboss.tools.seam121EAP.ui.test</module>
+ <module>org.jboss.tools.seamfp.ui.test</module>
<module>org.jboss.tools.seam.xml.test</module>
</modules>
</project>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23017 - in trunk/seam/tests: org.jboss.tools.seam.pages.xml.test and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-24 19:23:10 -0400 (Thu, 24 Jun 2010)
New Revision: 23017
Removed:
trunk/seam/tests/org.jboss.tools.seam.core.test/ant.properties
trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/ant.properties
trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/ant.properties
trunk/seam/tests/org.jboss.tools.seam201GA.core.test/ant.properties
trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/ant.properties
trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/ant.properties
trunk/seam/tests/org.jboss.tools.seamfp.core.test/ant.properties
Log:
unnecessary files were remowed like ant.properties
Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/ant.properties
===================================================================
Deleted: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/ant.properties
===================================================================
Deleted: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/ant.properties
===================================================================
Deleted: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/ant.properties
===================================================================
Deleted: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/ant.properties
===================================================================
Deleted: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/ant.properties
===================================================================
Deleted: trunk/seam/tests/org.jboss.tools.seamfp.core.test/ant.properties
===================================================================
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23016 - in trunk: requirements/generic and 28 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-24 19:13:52 -0400 (Thu, 24 Jun 2010)
New Revision: 23016
Modified:
trunk/requirements/build.xml
trunk/requirements/buildRequirements.xml
trunk/requirements/generic/build.xml
trunk/seam/features/org.jboss.tools.seam.feature/pom.xml
trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml
trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml
trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-6492 Skip requirements download if -o (offline) option is specified
requirements build checks:
- maven.test.skip
- settings.offline
if first is defined in -D in command line, requirements build is skipped
if second is defined as -o in command line, downloaded before requirements are used, if something is missing it just skipped with message
Modified: trunk/requirements/build.xml
===================================================================
--- trunk/requirements/build.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/requirements/build.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -1,27 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ======================================================================
- May 21, 2010 4:44:14 PM
-
- project
- description
-
- eskimo
- ====================================================================== -->
<project name="project" default="default">
- <description>
- description
- </description>
-
- <!-- =================================
- target: default
- ================================= -->
<import file="buildRequirements.xml" />
+
<property name="requirement.root" value="${basedir}" />
- <property name="requirement.build.root" value="${basedir}/download" />
- <target name="default" description="description">
- <echo>requirements=${requirements}</echo>
- <echo>unzipto=${basedir}/target/requirements</echo>
- <buildRequirements requirements="${requirements}" unzipto="${basedir}/target" />
- </target>
+ <property name="requirement.download.root" value="${basedir}/download" />
+
+ <condition property="skipRequirementBuild">
+ <equals arg1="${maven.test.skip}" arg2="true"/>
+ </condition>
+
+ <target name="default" description="description" unless="skipRequirementBuild">
+ <echo>maven.test.skip=${maven.test.skip}</echo>
+ <echo>settings.offline=${settings.offline}</echo>
+ <echo>requirements=${requirements}</echo>
+ <echo>unzipto=${basedir}/target/requirements</echo>
+ <buildRequirements requirements="${requirements}" unzipto="${basedir}/target" />
+ </target>
</project>
Modified: trunk/requirements/buildRequirements.xml
===================================================================
--- trunk/requirements/buildRequirements.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/requirements/buildRequirements.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -141,42 +141,4 @@
</sequential>
</target-->
- <target name="getBaseRequirements">
- <property file="build.requires" />
- <buildRequirements requirements="${build.requires}" unzipto="${build.output.directory}" />
- </target>
-
- <target name="cleanRequirements">
- <!-- https://jira.jboss.org/jira/browse/JBQA-3313 Use static, shared space outside workspace, instead of working directly in the workspace -->
- <if>
- <available file="/home/hudson/static_build_env/jbds" type="dir" />
- <then>
- <var name="requirement.build.root" unset="true" />
- <property name="requirement.build.root" value="/home/hudson/static_build_env/jbds/requirements" />
- <mkdir dir="${requirement.build.root}" />
- </then>
- </if>
- <echo level="debug">requirement.build.root = ${requirement.build.root}</echo>
-
- <delete failonerror="false" includeemptydirs="true">
- <fileset dir="${requirement.root}" defaultexcludes="false">
- <include name="**/return.properties" />
- </fileset>
- <!-- should check build.destination if builder is build instead of creating temp files in local SVN copy-->
- <fileset dir="${build.root}/builders">
- <include name="**/builder.built" />
- </fileset>
- </delete>
- </target>
-
- <macrodef name="buildBuilders">
- <attribute name="builders" />
- <sequential>
- <for list="@{builders}" param="current-builder">
- <sequential>
- <runBuilder builder="@{current-builder}" />
- </sequential>
- </for>
- </sequential>
- </macrodef>
</project>
\ No newline at end of file
Modified: trunk/requirements/generic/build.xml
===================================================================
--- trunk/requirements/generic/build.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/requirements/generic/build.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -4,7 +4,7 @@
<property name="driver.properties" value="${basedir}/build.properties" />
<loadproperties srcFile="${driver.properties}"/>
- <property name="driver.dest" value="${requirement.build.root}/${requirement}"/>
+ <property name="driver.dest" value="${requirement.download.root}/${requirement}"/>
<target name="init" />
@@ -19,22 +19,25 @@
<target name="unzip.archive" depends="download.archive">
<property name="ext" value="zip"/>
<echo level="debug">Unpacking ${driver.dest}/${build.archive} to ${unzip.dest}</echo>
- <antcall target="unpack-${ext}" />
- <!--unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}" /-->
- <tstamp/>
- <antcall target="post.unpack.requirement" />
+ <if>
+ <available file="${driver.dest}/${build.archive}" />
+ <then>
+ <antcall target="unpack-${ext}" />
+ <tstamp/>
+ <antcall target="post.unpack.requirement"/>
+ </then>
+ </if>
+
</target>
<target name="post.unpack.requirement">
- <!--echo file="${requirement.root}/${requirement}/return.properties"># Generated on ${DSTAMP} ${TSTAMP}
- </echo-->
</target>
- <target name="unpack-tar.gz" >
+ <target name="unpack-tar.gz">
<untar compression="gzip" src="${driver.dest}/${build.archive}" dest="${unzip.dest}" />
</target>
- <target name="unpack-zip" >
+ <target name="unpack-zip">
<unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}" />
</target>
@@ -51,7 +54,7 @@
<checksum file="${driver.dest}/${build.archive}" property="current.md5"/>
<echo level="verbose">${current.md5} calculated</echo>
<echo level="verbose">${md5} provided</echo>
- <condition property="archive.exists">
+ <condition property="archive.exists" >
<equals arg1="${current.md5}" arg2="${md5}"/>
</condition>
<if>
@@ -77,14 +80,25 @@
</target>
<target name="download.archive" depends="check.archive" unless="archive.exists">
- <mkdir dir="${driver.dest}"/>
- <get taskname="download ${requirement}"
- src="${build.uri}/${build.archive}"
- dest="${driver.dest}/${build.archive}" />
- <antcall target="post.download.requirement"/>
+ <if>
+ <or>
+ <equals arg1="${settings.offline}" arg2="true" />
+ <equals arg1="${maven.test.skip}" arg2="true" />
+ </or>
+ <then>
+ <echo>Skip download for ${build.uri}/${build.archive} because of tests are skept or build is running in offline mode</echo>
+ </then>
+ <else>
+ <mkdir dir="${driver.dest}"/>
+ <get taskname="download ${requirement}"
+ src="${build.uri}/${build.archive}"
+ dest="${driver.dest}/${build.archive}" />
+ <antcall target="post.download.requirement"/>
+ </else>
+ </if>
</target>
<target name="post.download.requirement">
</target>
-
+
</project>
Modified: trunk/seam/features/org.jboss.tools.seam.feature/pom.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,8 +7,8 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.seam.feature</artifactId>
+ <groupId>org.jboss.tool.seam.features</groupId>
+ <artifactId>org.jboss.tools.seam.feature</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -42,4 +42,95 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.seam121EAP.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam121EAP.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam201GA.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam201GA.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam202SP1.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam202SP1.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam203CR1.core201.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam203CR1.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam211GA.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam220CR1.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam220GA.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seamfp.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seamfp.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.features</groupId>
<artifactId>org.jboss.tools.seam.test.feature</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -375,7 +375,10 @@
<attribute name="kind"/>
<persistent
value="true">
- </persistent>
+ </persistent>
+ <attribute
+ name="seamRuntimeName">
+ </attribute>
</extension>
<extension
@@ -535,4 +538,4 @@
</exclude>
</validator>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.core</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.doc.user</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.pages.xml</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.text.ext</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.ui</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.ui.pages</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.xml</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.plugins</groupId>
<artifactId>org.jboss.tools.seam.xml.ui</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -8,7 +8,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam.core.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -26,13 +26,11 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.core.test</bundle>
<bundle>org.jboss.tools.seam.core</bundle>
</explodedBundles>
<product>org.jboss.tools.tests</product>
- <!--argLine>-Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</argLine-->
<includes>
<include>org/jboss/tools/seam/core/test/SeamValidatorsAllTests.class</include>
<include>org/jboss/tools/seam/core/test/SeamCoreAllTests.class</include>
@@ -41,24 +39,7 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam.pages.xml.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam.ui.bot.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.core.test</bundle>
<bundle>org.jboss.tools.seam.core</bundle>
@@ -37,24 +36,7 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam.xml.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -8,7 +8,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam121EAP.core.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -38,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam121EAP.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
@@ -39,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -8,7 +8,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam201GA.core.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -38,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam201GA.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
@@ -39,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -8,7 +8,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam202SP1.core.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -37,23 +37,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam202SP1.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
@@ -39,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -8,7 +8,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam203CR1.core.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -38,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam203CR1.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
@@ -39,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.tests</groupId>
<artifactId>org.jboss.tools.seam211GA.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -39,23 +39,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam220CR1.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
@@ -39,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.tests</groupId>
<artifactId>org.jboss.tools.seam220GA.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -39,23 +39,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -8,7 +8,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.tests</groupId>
<artifactId>org.jboss.tools.seamfp.core.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -38,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
+++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seamfp.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <skip>false</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
@@ -39,23 +38,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>prepare-eclipse-base</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant dir="${projectRoot}/requirements" inheritAll="true">
- <property name="requirements" value="${requirements}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23015 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-24 18:51:53 -0400 (Thu, 24 Jun 2010)
New Revision: 23015
Modified:
trunk/parent-pom.xml
Log:
clean up parent-pom.xml
- unused repos removed from helios profile
- plugin management node added to minimize requirements build pom part in certan poms
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-06-24 22:17:16 UTC (rev 23014)
+++ trunk/parent-pom.xml 2010-06-24 22:51:53 UTC (rev 23015)
@@ -18,6 +18,38 @@
</properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>prepare-eclipse-base</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo>Requirements build</echo>
+ <echo>requirements=${requirements}</echo>
+ <echo>maven.test.skip=${maven.test.skip}</echo>
+ <echo>settings.offline=${settings.offline}</echo>
+
+ <ant dir="${projectRoot}/requirements" inheritAll="true" >
+ <property name="requirements" value="${requirements}" />
+ <property name="settings.offline" value="${settings.offline}" />
+ </ant>
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.sonatype.tycho</groupId>
@@ -188,76 +220,13 @@
</plugin>
</plugins>
</build>
- <repositories>
- <!-- <repository> <id>helios</id> <url>http://download.eclipse.org/releases/helios/</url>
- <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases>
- <enabled>true</enabled> </releases> </repository> <repository> <id>webtools32</id>
- <url>http://download.eclipse.org/webtools/repository/helios</url> <layout>p2</layout>
- <snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled>
- </releases> </repository> <repository> <id>eclipse36r</id> <url>http://download.eclipse.org/eclipse/updates/3.6/</url>
- <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases>
- <enabled>true</enabled> </releases> </repository> <repository> <id>eclipse36m</id>
- <url>http://download.eclipse.org/eclipse/updates/3.6milestones/</url> <layout>p2</layout>
- <snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled>
- </releases> </repository> <repository> <id>birt26r</id> <url>http://download.eclipse.org/birt/update-site/2.6/</url>
- <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases>
- <enabled>true</enabled> </releases> </repository> <repository> <id>birt26i</id>
- <url>http://download.eclipse.org/birt/update-site/2.6-interim/ </url> <layout>p2</layout>
- <snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled>
- </releases> </repository> <repository> <id>swtbot-helios</id> <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository> -->
-
- <!-- TEMPORARY galileo reqs NOT in target platform TODO: remove these
- when no longer needed -->
- <repository>
- <id>galileo</id>
- <url>http://download.eclipse.org/releases/galileo/</url>
- <layout>p2</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>eclipse35</id>
- <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
- <layout>p2</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>birt25r</id>
- <url>http://download.eclipse.org/birt/update-site/2.5</url>
- <layout>p2</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>swtbot-galileo</id>
- <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>webtools</id>
- <url>http://download.eclipse.org/webtools/updates/</url>
- <layout>p2</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</profile>
+
<!-- Time saver: to build everything from scratch (without target platform);
- enable with -P helios-no-target -->
+ To enable it use -P helios-no-target in command line.
+ Do not remove repos that contains the same artefacts, it is done for purpose
+ to make build more stable in case one of the repos is offline.
+ -->
<profile>
<id>helios-no-target</id>
<repositories>
@@ -295,9 +264,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- <repository> <id>eclipse36m</id> <url>http://download.eclipse.org/eclipse/updates/3.6milestones/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository> -->
<repository>
<id>birt26</id>
<url>http://download.eclipse.org/birt/update-site/2.6/
@@ -310,9 +276,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- <repository> <id>birt26i</id> <url>http://download.eclipse.org/birt/update-site/2.6-interim/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository> -->
<repository>
<id>swtbot-helios</id>
<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
@@ -359,12 +322,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- <repository> <id>tptp</id> <url>http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/</url>
- <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases>
- <enabled>true</enabled> </releases> </repository> -->
- <!-- <repository> <id>emf</id> <url>http://download.eclipse.org/modeling/emf/emf/updates/2.6/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository> -->
</repositories>
</profile>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23014 - branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-06-24 18:17:16 -0400 (Thu, 24 Jun 2010)
New Revision: 23014
Modified:
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml
Log:
Added JSONReader model
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml 2010-06-24 22:09:28 UTC (rev 23013)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml 2010-06-24 22:17:16 UTC (rev 23014)
@@ -6,6 +6,8 @@
-->
<json:reader>
<json:keyMap>
+ <json:key from="a" to="1" />
+ <json:key from="b" to="2" />
<json:key from="some&key" to="someAndKey" />
</json:keyMap>
</json:reader>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23013 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-06-24 18:09:28 -0400 (Thu, 24 Jun 2010)
New Revision: 23013
Added:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/JSONReader.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/JSONReaderTest.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-03.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-04.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-05.xml
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/edi/EDIReader.java
Log:
Added JSONReader model
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-24 21:50:13 UTC (rev 23012)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-24 22:09:28 UTC (rev 23013)
@@ -22,8 +22,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.util.List;
-import java.util.Properties;
import org.milyn.SmooksException;
import org.milyn.javabean.dynamic.Model;
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java 2010-06-24 21:50:13 UTC (rev 23012)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java 2010-06-24 22:09:28 UTC (rev 23013)
@@ -23,7 +23,7 @@
import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
/**
- * CSV Reader.
+ * CSV Reader mapping model.
*
* @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly(a)gmail.com</a>
*/
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-24 21:50:13 UTC (rev 23012)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-24 22:09:28 UTC (rev 23013)
@@ -30,6 +30,16 @@
edi12.schemaLocation=/META-INF/xsd/smooks/edi-1.2.xsd
edi12.bindingConfigLocation=/org/jboss/tools/smooks/model/edi/v1_2/v1.2.xml
+ # json v1.1
+json11.namespace=http://www.milyn.org/xsd/smooks/json-1.1.xsd
+json11.schemaLocation=/META-INF/xsd/smooks/json-1.1.xsd
+json11.bindingConfigLocation=/org/jboss/tools/smooks/model/json/v1_1/v1.1.xml
+
+ # json v1.2
+json12.namespace=http://www.milyn.org/xsd/smooks/json-1.2.xsd
+json12.schemaLocation=/META-INF/xsd/smooks/json-1.2.xsd
+json12.bindingConfigLocation=/org/jboss/tools/smooks/model/json/v1_2/v1.2.xml
+
# javabean v1.1
jb11.namespace=http://www.milyn.org/xsd/smooks/javabean-1.1.xsd
jb11.schemaLocation=/META-INF/xsd/smooks/javabean-1.1.xsd
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/edi/EDIReader.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/edi/EDIReader.java 2010-06-24 21:50:13 UTC (rev 23012)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/edi/EDIReader.java 2010-06-24 22:09:28 UTC (rev 23013)
@@ -23,7 +23,7 @@
import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
/**
- * EDI mapping model.
+ * EDI Reader mapping model.
*
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/JSONReader.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/JSONReader.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/JSONReader.java 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,92 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.json;
+
+import java.util.Map;
+
+import org.jboss.tools.smooks.model.core.Reader;
+import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
+
+/**
+ * JSON Reader mapping model.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+@DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/json-1.2.xsd", prefix = "json12")
+public class JSONReader implements Reader {
+
+ private Map<String, String> keyMap;
+ private String rootName;
+ private String arrayElementName;
+ private String nullValueReplacement;
+ private String keyWhitspaceReplacement;
+ private String keyPrefixOnNumeric;
+ private String illegalElementNameCharReplacement;
+ private Boolean indent;
+
+ public Map<String, String> getKeyMap() {
+ return keyMap;
+ }
+ public void setKeyMap(Map<String, String> keyMap) {
+ this.keyMap = keyMap;
+ }
+ public String getRootName() {
+ return rootName;
+ }
+ public void setRootName(String rootName) {
+ this.rootName = rootName;
+ }
+ public String getArrayElementName() {
+ return arrayElementName;
+ }
+ public void setArrayElementName(String arrayElementName) {
+ this.arrayElementName = arrayElementName;
+ }
+ public String getNullValueReplacement() {
+ return nullValueReplacement;
+ }
+ public void setNullValueReplacement(String nullValueReplacement) {
+ this.nullValueReplacement = nullValueReplacement;
+ }
+ public String getKeyWhitspaceReplacement() {
+ return keyWhitspaceReplacement;
+ }
+ public void setKeyWhitspaceReplacement(String keyWhitspaceReplacement) {
+ this.keyWhitspaceReplacement = keyWhitspaceReplacement;
+ }
+ public String getKeyPrefixOnNumeric() {
+ return keyPrefixOnNumeric;
+ }
+ public void setKeyPrefixOnNumeric(String keyPrefixOnNumeric) {
+ this.keyPrefixOnNumeric = keyPrefixOnNumeric;
+ }
+ public String getIllegalElementNameCharReplacement() {
+ return illegalElementNameCharReplacement;
+ }
+ public void setIllegalElementNameCharReplacement(String illegalElementNameCharReplacement) {
+ this.illegalElementNameCharReplacement = illegalElementNameCharReplacement;
+ }
+ public Boolean getIndent() {
+ return indent;
+ }
+ public void setIndent(Boolean indent) {
+ this.indent = indent;
+ }
+}
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/JSONReader.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.ftl 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,13 @@
+<#if bean.keyMap??>
+ <${nsp}:reader <@writeAttribs attribs="rootName,arrayElementName,nullValueReplacement,keyWhitspaceReplacement,keyPrefixOnNumeric,illegalElementNameCharReplacement" />>
+ <${nsp}:keyMap>
+ <#assign keys = bean.keyMap?keys>
+ <#list keys as from>
+ <${nsp}:key from="${from?html}" to="${bean.keyMap[from]}"/>
+ </#list>
+ </${nsp}:keyMap>
+ </${nsp}:reader>
+<#else>
+ <${nsp}:reader <@writeAttribs attribs="rootName,arrayElementName,nullValueReplacement,keyWhitspaceReplacement,keyPrefixOnNumeric,illegalElementNameCharReplacement" /> />
+</#if>
+
\ No newline at end of file
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.xml
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.xml 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd"
+ xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd">
+
+ <!-- Binding configs (unmarshal)... -->
+ <jb:bean beanId="jsonReader" class="org.jboss.tools.smooks.model.json.JSONReader" createOnElement="reader">
+ <jb:wiring property="keyMap" beanIdRef="keyMap" />
+ <jb:value property="rootName" data="reader/@rootName" />
+ <jb:value property="arrayElementName" data="reader/@arrayElementName" />
+ <jb:value property="nullValueReplacement" data="reader/@nullValueReplacement" />
+ <jb:value property="keyWhitspaceReplacement" data="reader/@keyWhitspaceReplacement" />
+ <jb:value property="keyPrefixOnNumeric" data="reader/@keyPrefixOnNumeric" />
+ <jb:value property="illegalElementNameCharReplacement" data="reader/@illegalElementNameCharReplacement" />
+ </jb:bean>
+ <jb:bean beanId="keyMap" class="java.util.LinkedHashMap" createOnElement="reader/keyMap">
+ <jb:value property="@from" data="reader/keyMap/key/@to" />
+ </jb:bean>
+
+ <!-- Writers (marshal)... -->
+
+ <dmb:writer beanId="jsonReader" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
+ <param name="template">/org/jboss/tools/smooks/model/json/v1_1/v1.1.ftl</param>
+ </dmb:writer>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_1/v1.1.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.ftl 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,13 @@
+<#if bean.keyMap??>
+ <${nsp}:reader <@writeAttribs attribs="rootName,arrayElementName,nullValueReplacement,keyWhitspaceReplacement,keyPrefixOnNumeric,illegalElementNameCharReplacement,indent" />>
+ <${nsp}:keyMap>
+ <#assign keys = bean.keyMap?keys>
+ <#list keys as from>
+ <${nsp}:key from="${from?html}" to="${bean.keyMap[from]}"/>
+ </#list>
+ </${nsp}:keyMap>
+ </${nsp}:reader>
+<#else>
+ <${nsp}:reader <@writeAttribs attribs="rootName,arrayElementName,nullValueReplacement,keyWhitspaceReplacement,keyPrefixOnNumeric,illegalElementNameCharReplacement,indent" /> />
+</#if>
+
\ No newline at end of file
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.xml
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.xml 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd"
+ xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd">
+
+ <!-- Binding configs (unmarshal)... -->
+ <jb:bean beanId="jsonReader" class="org.jboss.tools.smooks.model.json.JSONReader" createOnElement="reader">
+ <jb:wiring property="keyMap" beanIdRef="keyMap" />
+ <jb:value property="rootName" data="reader/@rootName" />
+ <jb:value property="arrayElementName" data="reader/@arrayElementName" />
+ <jb:value property="nullValueReplacement" data="reader/@nullValueReplacement" />
+ <jb:value property="keyWhitspaceReplacement" data="reader/@keyWhitspaceReplacement" />
+ <jb:value property="keyPrefixOnNumeric" data="reader/@keyPrefixOnNumeric" />
+ <jb:value property="illegalElementNameCharReplacement" data="reader/@illegalElementNameCharReplacement" />
+ <jb:value property="indent" data="reader/@indent" />
+ </jb:bean>
+ <jb:bean beanId="keyMap" class="java.util.LinkedHashMap" createOnElement="reader/keyMap">
+ <jb:value property="@from" data="reader/keyMap/key/@to" />
+ </jb:bean>
+
+ <!-- Writers (marshal)... -->
+
+ <dmb:writer beanId="jsonReader" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
+ <param name="template">/org/jboss/tools/smooks/model/json/v1_2/v1.2.ftl</param>
+ </dmb:writer>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/json/v1_2/v1.2.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/JSONReaderTest.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/JSONReaderTest.java (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/JSONReaderTest.java 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,55 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.json;
+
+import java.io.IOException;
+
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
+import org.xml.sax.SAXException;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly(a)gmail.com</a>
+ */
+public class JSONReaderTest extends SmooksModelTestCase {
+
+ public JSONReaderTest() throws IOException, SAXException {
+ super();
+ }
+
+ public void test_v11_01() throws IOException, SAXException {
+ test("config-01.xml");
+ }
+
+ public void test_v11_02() throws IOException, SAXException {
+ test("config-02.xml");
+ }
+
+ public void test_v12_01() throws IOException, SAXException {
+ test("config-03.xml");
+ }
+
+ public void test_v12_02() throws IOException, SAXException {
+ test("config-04.xml");
+ }
+
+ public void test_v11_and_v12() throws IOException, SAXException {
+ test("config-05.xml");
+ }
+}
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/JSONReaderTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:json="http://www.milyn.org/xsd/smooks/json-1.1.xsd">
+
+ <!--
+ Comment...
+ -->
+ <json:reader>
+ <json:keyMap>
+ <json:key from="some&key" to="someAndKey" />
+ </json:keyMap>
+ </json:reader>
+
+</smooks-resource-list>
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-01.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-02.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-02.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-02.xml 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:json="http://www.milyn.org/xsd/smooks/json-1.1.xsd">
+
+ <!--
+ Configure the JSON Reader to read the message into a stream of SAX events.
+ -->
+ <json:reader keyWhitspaceReplacement="_" keyPrefixOnNumeric="n" illegalElementNameCharReplacement="." nullValueReplacement="##NULL##" />
+
+</smooks-resource-list>
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-02.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-03.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-03.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-03.xml 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:json="http://www.milyn.org/xsd/smooks/json-1.2.xsd">
+
+ <!--
+ Comment...
+ -->
+ <json:reader>
+ <json:keyMap>
+ <json:key from="some&key" to="someAndKey" />
+ </json:keyMap>
+ </json:reader>
+
+</smooks-resource-list>
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-03.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-04.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-04.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-04.xml 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:json="http://www.milyn.org/xsd/smooks/json-1.2.xsd">
+
+ <!--
+ Configure the JSON Reader to read the message into a stream of SAX events.
+ -->
+ <json:reader keyWhitspaceReplacement="_" keyPrefixOnNumeric="n" illegalElementNameCharReplacement="." nullValueReplacement="##NULL##" indent="true" />
+
+</smooks-resource-list>
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-04.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-05.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-05.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-05.xml 2010-06-24 22:09:28 UTC (rev 23013)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:json11="http://www.milyn.org/xsd/smooks/json-1.1.xsd"
+ xmlns:json12="http://www.milyn.org/xsd/smooks/json-1.2.xsd">
+
+ <!--
+ Comment...
+ -->
+ <json11:reader>
+ <json11:keyMap>
+ <json11:key from="some&key" to="someAndKey" />
+ </json11:keyMap>
+ </json11:reader>
+
+ <!--
+ Configure the JSON Reader to read the message into a stream of SAX events.
+ -->
+ <json12:reader keyWhitspaceReplacement="_" keyPrefixOnNumeric="n" illegalElementNameCharReplacement="." nullValueReplacement="##NULL##" indent="true" />
+
+</smooks-resource-list>
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/json/config-05.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23012 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-24 17:50:13 -0400 (Thu, 24 Jun 2010)
New Revision: 23012
Modified:
trunk/build/publish.sh
Log:
collect build and test error logs into published destination folder
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-24 21:18:38 UTC (rev 23011)
+++ trunk/build/publish.sh 2010-06-24 21:50:13 UTC (rev 23012)
@@ -6,7 +6,13 @@
# define target zip filename for inclusion in uberbuilder's bucky aggregator
SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip
+# cleanup from last time
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
+
+# get full build log and filter out Maven test failures
+wget http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${WORKSPACE}/site/${JOB_NAME}/buildlog.txt
+cat ${WORKSPACE}/site/${JOB_NAME}/buildlog.txt | grep -A9 "<<< FAILURE" | egrep -v ".+at (sun.|java.).+" > ${WORKSPACE}/site/${JOB_NAME}/errorlog.txt
+
for z in ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/sources/site/target/site_assembly.zip; do
if [[ -f $z ]]; then
#echo "$z ..."
13 years, 11 months
- 1
- 0