[doubleclick] r61 committed - * Removed sample project from pom tree...
doubl...@googlecode.com
Author: development.jsh
Date: Sun May 30 16:18:05 2010
Log: * Removed sample project from pom tree
* removed xml version
http://code.google.com/p/doubleclick/source/detail?r=61
Modified:
/trunk/pom.xml
/trunk/samples/click-spring/pom.xml
/trunk/samples/click-spring/src/main/webapp/WEB-INF/applicationContext.xml
/trunk/samples/click-spring/src/main/webapp/WEB-INF/click.xml
/trunk/samples/click-spring/src/main/webapp/WEB-INF/web.xml
=======================================
--- /trunk/pom.xml Sat May 29 18:37:18 2010
+++ /trunk/pom.xml Sun May 30 16:18:05 2010
@@ -12,7 +12,6 @@
<modules>
<module>inject</module>
<module>injectspring</module>
- <module>samples</module>
</modules>
<properties>
@@ -120,6 +119,6 @@
</build>
<scm>
-
<developerConnection>scm:svn:svn:https://doubleclick.googlecode.com/svn/tags/doubleclick-1.0</developerConnection>
+
<developerConnection>scm:svn:https://doubleclick.googlecode.com/svn/tags/doubleclick-1.0</developerConnection>
</scm>
</project>
=======================================
--- /trunk/samples/click-spring/pom.xml Sat May 29 18:37:18 2010
+++ /trunk/samples/click-spring/pom.xml Sun May 30 16:18:05 2010
@@ -1,48 +1,61 @@
<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.apache.click.doubleclick.samples</groupId>
- <version>1.1-SNAPSHOT</version>
- </parent>
-
<groupId>org.apache.click.doubleclick.samples</groupId>
<artifactId>click-spring</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>click-spring</name>
+ <repositories>
+ <repository>
+ <id>powermock-repo</id>
+ <url>https://doubleclick.googlecode.com/svn/repo/</url>
+ </repository>
+ </repositories>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <click.version>2.2.0-RC1</click.version>
+ <jetty.version>6.1.4</jetty.version>
+ <spring.version>2.5.4</spring.version>
+ <servlet.version>2.5</servlet.version>
+ <doubleclick.version>1.1-SNAPSHOT</doubleclick.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.click.doubleclick</groupId>
<artifactId>inject</artifactId>
+ <version>${doubleclick.version}</version>
</dependency>
<dependency>
<groupId>org.apache.click.doubleclick</groupId>
<artifactId>injectspring</artifactId>
+ <version>${doubleclick.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>${servlet.version}</version>
</dependency>
<dependency>
<groupId>org.apache.click</groupId>
<artifactId>click</artifactId>
+ <version>${click.version}</version>
</dependency>
<dependency>
<groupId>org.apache.click</groupId>
<artifactId>click-extras</artifactId>
+ <version>${click.version}</version>
</dependency>
<!-- spring dependency -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
+ <version>${spring.version}</version>
</dependency>
<!--jetty dependencies-->
@@ -50,14 +63,17 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
+ <version>${jetty.version}</version>
</dependency>
</dependencies>
@@ -85,6 +101,25 @@
<contextPath>/clickspring</contextPath>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
=======================================
---
/trunk/samples/click-spring/src/main/webapp/WEB-INF/applicationContext.xml
Mon May 17 13:59:13 2010
+++
/trunk/samples/click-spring/src/main/webapp/WEB-INF/applicationContext.xml
Sun May 30 16:18:05 2010
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
=======================================
--- /trunk/samples/click-spring/src/main/webapp/WEB-INF/click.xml Mon May
17 13:59:13 2010
+++ /trunk/samples/click-spring/src/main/webapp/WEB-INF/click.xml Sun May
30 16:18:05 2010
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<click-app>
<pages
package="org.apache.click.doubleclick.samples.clickspring.pages"
autobinding="annotation"/>
<page-interceptor
classname="org.apache.click.doubleclick.inject.DependencyInjectorPageInterceptor"
=======================================
--- /trunk/samples/click-spring/src/main/webapp/WEB-INF/web.xml Thu May 27
05:47:38 2010
+++ /trunk/samples/click-spring/src/main/webapp/WEB-INF/web.xml Sun May 30
16:18:05 2010
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<web-app id="WebApp_9" version="2.4"
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee