Skip to content

Commit 95c309c

Browse files
committed
Removed XML templating system and moved a bunch of deps to provided. Also cleaned up a bunch of stuff with the template loader system
1 parent 7cfd84d commit 95c309c

File tree

24 files changed

+230
-1806
lines changed

24 files changed

+230
-1806
lines changed

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<module>sitebricks-test-support</module>
3434
<module>sitebricks-mail</module>
3535
<module>sitebricks-options</module>
36-
<module>sitebricks-jetty-archetype</module>
3736
<module>sitebricks-channel</module>
3837
<module>stat</module>
3938
<module>slf4j</module>

sitebricks-acceptance-tests/pom.xml

+31
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,37 @@
2222
<groupId>com.google.sitebricks</groupId>
2323
<artifactId>sitebricks-channel</artifactId>
2424
</dependency>
25+
<dependency>
26+
<groupId>saxpath</groupId>
27+
<artifactId>saxpath</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>jaxen</groupId>
31+
<artifactId>jaxen</artifactId>
32+
<exclusions>
33+
<exclusion>
34+
<artifactId>xercesImpl</artifactId>
35+
<groupId>xerces</groupId>
36+
</exclusion>
37+
<exclusion>
38+
<artifactId>xml-apis</artifactId>
39+
<groupId>xml-apis</groupId>
40+
</exclusion>
41+
</exclusions>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.freemarker</groupId>
45+
<artifactId>freemarker</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.thoughtworks.xstream</groupId>
49+
<artifactId>xstream</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>xalan</groupId>
53+
<artifactId>xalan</artifactId>
54+
<version>2.7.0</version>
55+
</dependency>
2556

2657
<!-- Jetty webserver -->
2758
<dependency>

sitebricks-client/src/main/java/com/google/sitebricks/client/transport/JacksonJsonTransportWithConverters.java

-169
This file was deleted.

sitebricks-jetty-archetype/pom.atom

-11
This file was deleted.

sitebricks-jetty-archetype/pom.xml

-16
This file was deleted.

sitebricks-jetty-archetype/src/main/resources/META-INF/maven/archetype.xml

-16
This file was deleted.

sitebricks-jetty-archetype/src/main/resources/WEB-INF/web.xml

-30
This file was deleted.

sitebricks-jetty-archetype/src/main/resources/archetype-resources/pom.xml

-60
This file was deleted.

sitebricks-jetty-archetype/src/main/resources/archetype-resources/src/main/java/AppConfig.java

-29
This file was deleted.

0 commit comments

Comments
 (0)