tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mluse...@apache.org
Subject git commit: adjust quickstart achertype to reflect changes introduced by the adoption of bootstrap 3
Date Wed, 28 Aug 2013 18:10:52 GMT
Updated Branches:
  refs/heads/master 76f2679fd -> d2cd6f668


adjust quickstart achertype to reflect changes introduced by the adoption of bootstrap 3


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d2cd6f66
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d2cd6f66
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d2cd6f66

Branch: refs/heads/master
Commit: d2cd6f6680bc6e5bff89f7e9c9703f83950c980e
Parents: 76f2679
Author: Massimo Lusetti <mlusetti@apache.org>
Authored: Wed Aug 28 20:10:26 2013 +0200
Committer: Massimo Lusetti <mlusetti@apache.org>
Committed: Wed Aug 28 20:10:26 2013 +0200

----------------------------------------------------------------------
 .../src/main/java/services/AppModule.java            | 15 ++++++++++-----
 .../resources/META-INF/maven/archetype-metadata.xml  |  6 ++++++
 2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d2cd6f66/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
----------------------------------------------------------------------
diff --git a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
index 87d645e..c42293e 100644
--- a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
+++ b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
@@ -6,11 +6,14 @@ import org.apache.tapestry5.*;
 import org.apache.tapestry5.ioc.MappedConfiguration;
 import org.apache.tapestry5.ioc.OrderedConfiguration;
 import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.annotations.Contribute;
 import org.apache.tapestry5.ioc.annotations.Local;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestFilter;
-import org.apache.tapestry5.services.RequestHandler;
-import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.ioc.services.ApplicationDefaults;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.services.*;
+import org.apache.tapestry5.services.javascript.JavaScriptStack;
+import org.apache.tapestry5.services.javascript.StackExtension;
+import org.apache.tapestry5.services.javascript.StackExtensionType;
 import org.slf4j.Logger;
 
 /**
@@ -62,10 +65,11 @@ public class AppModule
 	public static void setupEnvironment(MappedConfiguration<String, Object> configuration)
 	{
 		configuration.add(SymbolConstants.JAVASCRIPT_INFRASTRUCTURE_PROVIDER, "jquery");
-		configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "context:mybootstrap");
+//		configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "context:mybootstrap");
 		configuration.add(SymbolConstants.MINIFICATION_ENABLED, true);
 	}
 
+	/*
 	// This will override the bundled bootstrap version and will compile it at runtime
 	@Contribute(JavaScriptStack.class)
 	@Core
@@ -74,6 +78,7 @@ public class AppModule
 		configuration.override("bootstrap.css",
 				new StackExtension(StackExtensionType.STYLESHEET, "context:mybootstrap/css/bootstrap.css"),
"before:tapestry.css");
 	}
+	*/
 
     /**
      * This is a service definition, the service will be named "TimingFilter". The interface,

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d2cd6f66/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index 14a8549..a107b85 100644
--- a/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -19,6 +19,9 @@
                 <exclude>*.ico</exclude>
                 <exclude>**/*.jpg</exclude>
                 <exclude>**/*.gif</exclude>
+                <exclude>**/*.png</exclude>
+                <exclude>**/*.js</exclude>
+                <exclude>**/*.css</exclude>
             </excludes>
         </fileSet>
 
@@ -30,6 +33,9 @@
                 <include>*.ico</include>
                 <include>**/*.jpg</include>
                 <include>**/*.gif</include>
+                <include>**/*.png</include>
+                <include>**/*.js</include>
+                <include>**/*.css</include>
             </includes>
         </fileSet>
 


Mime
View raw message