fixing line endings and test cases

j-a-w-r · Dec 6, 2014 · 497b2f1 · 497b2f1
1 parent 81b0ac3
commit 497b2f1
Show file tree

Hide file tree

Showing 43 changed files with 712 additions and 922 deletions.
diff --git a/.derived b/.derived
@@ -0,0 +1,10 @@
+# Only used for Eclipse Plugin at 
+# https://github.com/nodj/AutoDeriv
+jawr
+jawr-dwr2.x
+jawr-dwr3.x
+jawr-grails
+jawr-spring
+jawr-tools
+jawr-wicket
+
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,10 @@ target/
 .launcher
 .classpath
 .project
+/jawr/
+/jawr-dwr2.x/
+/jawr-dwr3.x/
+/jawr-grails/
+/jawr-spring/
+/jawr-tools/
+/jawr-wicket/
diff --git a/jawr-dwr2.x/.derived b/jawr-dwr2.x/.derived
@@ -0,0 +1,3 @@
+jawr-dwr2.x-extension
+jawr-dwr2.x-integration-test
+jawr-dwr2.x-webapp-sample
diff --git a/jawr-dwr2.x/jawr-dwr2.x-webapp-sample/pom.xml b/jawr-dwr2.x/jawr-dwr2.x-webapp-sample/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>net.jawr</groupId>
@@ -70,7 +71,19 @@
 				<executions>
 					<execution>
 						<!-- Use this phase so that maven war includes our bundles -->
+						<id>withoutCDNFiles</id>
 						<phase>prepare-package</phase>
+						<configuration>
+							<generateCDNFiles>true</generateCDNFiles>
+						</configuration>
+					</execution>
+					<execution>
+						<!-- Use this phase so that maven war includes our bundles -->
+						<id>withCDNFiles</id>
+						<phase>prepare-package</phase>
+						<configuration>
+							<generateCDNFiles>true</generateCDNFiles>
+						</configuration>
 					</execution>
 				</executions>
 				<dependencies>
@@ -99,26 +112,6 @@
 					<generateCDNFiles>false</generateCDNFiles>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>net.jawr</groupId>
-				<artifactId>jawr-maven-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>com.carrotsearch</groupId>
-						<artifactId>smartsprites</artifactId>
-						<version>${smartsprites.version}</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<!-- Use this phase so that maven war includes our bundles -->
-						<phase>prepare-package</phase>
-					</execution>
-				</executions>
-				<configuration>
-					<generateCDNFiles>true</generateCDNFiles>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/jawr-dwr3.x/.derived b/jawr-dwr3.x/.derived
@@ -0,0 +1,3 @@
+jawr-dwr3.x-extension
+jawr-dwr3.x-integration-test
+jawr-dwr3.x-webapp-sample
diff --git a/jawr-dwr3.x/jawr-dwr3.x-integration-test/src/test/java/net/jawr/dwr/test/MainPageTest.java b/jawr-dwr3.x/jawr-dwr3.x-integration-test/src/test/java/net/jawr/dwr/test/MainPageTest.java
@@ -68,7 +68,7 @@ public void checkGeneratedJsLinks() {
 		assertEquals(2, scripts.size());
 		HtmlScript script = scripts.get(0);
 		assertEquals(
-				getUrlPrefix()+"/jawr/1356556111/bundles/global.js",
+				getUrlPrefix()+"/jawr/N1702504798/bundles/global.js",
 				script.getSrcAttribute());
 		script = scripts.get(1);
 		assertEquals(