Author: rahul
Date: Thu Sep 14 14:26:11 2006
New Revision: 443476
URL: http://svn.apache.org/viewvc?view=rev&rev=443476
Log:
Bah, we really need svn clients that warn us when we're about to commit
non-binary files without correct props. Maybe such a setting is already
possible.
Modified:
shale/sandbox/shale-test-dialog2-legacy/pom.xml (contents, props changed)
shale/sandbox/shale-test-dialog2-scxml/pom.xml (contents, props changed)
Modified: shale/sandbox/shale-test-dialog2-legacy/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-test-dialog2-legacy/pom.xml?view=diff&rev=443476&r1=443475&r2=443476
==============================================================================
--- shale/sandbox/shale-test-dialog2-legacy/pom.xml (original)
+++ shale/sandbox/shale-test-dialog2-legacy/pom.xml Thu Sep 14 14:26:11 2006
@@ -1,197 +1,197 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Id$
- */
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-apps-parent</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- </parent>
-
- <artifactId>shale-test-dialog2-legacy</artifactId>
- <packaging>war</packaging>
- <name>Shale Test App (Dialog2 Legacy Implementation)</name>
- <description>A sample application for Shale dialog2 features when using
the legacy dialog2 implementation.</description>
-
- <dependencies>
-
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>pull-parser</groupId>
- <artifactId>pull-parser</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>0.8</version>
- <scope>test</scope>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-core</artifactId>
- <version>${version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
--->
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-dialog2</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-dialog2-legacy</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/systest/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>itest</id>
- <activation>
- <property>
- <name>itest</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/systest/**</include>
- </includes>
- <excludes>
- <exclude>**/Tomcat5x**</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>url</name>
-
<value>http://localhost:8080/${artifactId}</value>
- </property>
- <!-- Define cargo.container.home
~/.m2/settings.xml or with -D on the command line -->
- <property>
- <name>cargo.container.home</name>
-
<value>${cargo.container.home}</value>
- </property>
- <property>
- <name>cargo.container.output</name>
-
<value>${basedir}/target/container.output</value>
- </property>
- <property>
- <name>cargo.container.log</name>
-
<value>${basedir}/target/container.log</value>
- </property>
- <property>
- <name>cargo.deployable</name>
-
<value>${basedir}/target/${artifactId}.war</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-apps-parent</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>shale-test-dialog2-legacy</artifactId>
+ <packaging>war</packaging>
+ <name>Shale Test App (Dialog2 Legacy Implementation)</name>
+ <description>A sample application for Shale dialog2 features when using
the legacy dialog2 implementation.</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>pull-parser</groupId>
+ <artifactId>pull-parser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+-->
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-dialog2</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-dialog2-legacy</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/systest/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>itest</id>
+ <activation>
+ <property>
+ <name>itest</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/systest/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/Tomcat5x**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>url</name>
+
<value>http://localhost:8080/${artifactId}</value>
+ </property>
+ <!-- Define cargo.container.home
~/.m2/settings.xml or with -D on the command line -->
+ <property>
+ <name>cargo.container.home</name>
+
<value>${cargo.container.home}</value>
+ </property>
+ <property>
+ <name>cargo.container.output</name>
+
<value>${basedir}/target/container.output</value>
+ </property>
+ <property>
+ <name>cargo.container.log</name>
+
<value>${basedir}/target/container.log</value>
+ </property>
+ <property>
+ <name>cargo.deployable</name>
+
<value>${basedir}/target/${artifactId}.war</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
+
Propchange: shale/sandbox/shale-test-dialog2-legacy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: shale/sandbox/shale-test-dialog2-scxml/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-test-dialog2-scxml/pom.xml?view=diff&rev=443476&r1=443475&r2=443476
==============================================================================
--- shale/sandbox/shale-test-dialog2-scxml/pom.xml (original)
+++ shale/sandbox/shale-test-dialog2-scxml/pom.xml Thu Sep 14 14:26:11 2006
@@ -1,197 +1,197 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Id$
- */
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-apps-parent</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- </parent>
-
- <artifactId>shale-test-dialog2-scxml</artifactId>
- <packaging>war</packaging>
- <name>Shale Test App (Dialog2 SCXML Implementation)</name>
- <description>A sample application for Shale dialog2 features when using
the Commons SCXML dialog2 implementation.</description>
-
- <dependencies>
-
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>pull-parser</groupId>
- <artifactId>pull-parser</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>0.8</version>
- <scope>test</scope>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-core</artifactId>
- <version>${version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
--->
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-dialog2</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-dialog2-scxml</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/systest/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>itest</id>
- <activation>
- <property>
- <name>itest</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/systest/**</include>
- </includes>
- <excludes>
- <exclude>**/Tomcat5x**</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>url</name>
-
<value>http://localhost:8080/${artifactId}</value>
- </property>
- <!-- Define cargo.container.home
~/.m2/settings.xml or with -D on the command line -->
- <property>
- <name>cargo.container.home</name>
-
<value>${cargo.container.home}</value>
- </property>
- <property>
- <name>cargo.container.output</name>
-
<value>${basedir}/target/container.output</value>
- </property>
- <property>
- <name>cargo.container.log</name>
-
<value>${basedir}/target/container.log</value>
- </property>
- <property>
- <name>cargo.deployable</name>
-
<value>${basedir}/target/${artifactId}.war</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-apps-parent</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>shale-test-dialog2-scxml</artifactId>
+ <packaging>war</packaging>
+ <name>Shale Test App (Dialog2 SCXML Implementation)</name>
+ <description>A sample application for Shale dialog2 features when using
the Commons SCXML dialog2 implementation.</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>pull-parser</groupId>
+ <artifactId>pull-parser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+-->
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-dialog2</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-dialog2-scxml</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/systest/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>itest</id>
+ <activation>
+ <property>
+ <name>itest</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/systest/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/Tomcat5x**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>url</name>
+
<value>http://localhost:8080/${artifactId}</value>
+ </property>
+ <!-- Define cargo.container.home
~/.m2/settings.xml or with -D on the command line -->
+ <property>
+ <name>cargo.container.home</name>
+
<value>${cargo.container.home}</value>
+ </property>
+ <property>
+ <name>cargo.container.output</name>
+
<value>${basedir}/target/container.output</value>
+ </property>
+ <property>
+ <name>cargo.container.log</name>
+
<value>${basedir}/target/container.log</value>
+ </property>
+ <property>
+ <name>cargo.deployable</name>
+
<value>${basedir}/target/${artifactId}.war</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
+
Propchange: shale/sandbox/shale-test-dialog2-scxml/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
