removed "site/" prefix for GWT code.

jdwyah · May 12, 2008 · b46e03c · b46e03c
1 parent ca9e7d2
commit b46e03c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/src/main/java/com/apress/progwt/client/GWTApp.java b/src/main/java/com/apress/progwt/client/GWTApp.java
@@ -43,7 +43,7 @@
 
 public class GWTApp {
 
-    private static final String MANIFEST_URL = "site/manifest.json";
+    private static final String MANIFEST_URL = "manifest.json";
 
     private static String getLoadID(int id) {
         return "gwt-slot-" + id;

diff --git a/src/main/java/com/apress/progwt/client/college/ToCollegeApp.java b/src/main/java/com/apress/progwt/client/college/ToCollegeApp.java
@@ -27,7 +27,7 @@
 
 public class ToCollegeApp extends GWTApp {
 
-    private static final String SECURE_TARGET_URL = "site/secure/myList.html";
+    private static final String SECURE_TARGET_URL = "secure/myList.html";
 
     private void loadGUI(Widget widget) {
         RootPanel.get(getPreLoadID()).setVisible(false);

diff --git a/src/main/java/com/apress/progwt/client/college/gui/SchoolLink.java b/src/main/java/com/apress/progwt/client/college/gui/SchoolLink.java
@@ -19,7 +19,7 @@
 
 public class SchoolLink extends ExternalLink {
     public SchoolLink(School school) {
-        super(school.getName(), "site/college/"
+        super(school.getName(), "college/"
                 + school.getName().replace(' ', '_'), true);
     }
 }
diff --git a/src/main/java/com/apress/progwt/client/college/gui/UserLink.java b/src/main/java/com/apress/progwt/client/college/gui/UserLink.java
@@ -19,11 +19,11 @@
 
 public class UserLink extends ExternalLink {
     public UserLink(User user) {
-        super(user.getNickname(), "site/user/" + user.getNickname(), true);
+        super(user.getNickname(), "user/" + user.getNickname(), true);
     }
 
     public UserLink(User user, String prepend) {
-        super(prepend + user.getNickname(), "site/user/"
+        super(prepend + user.getNickname(), "user/"
                 + user.getNickname(), true);
     }
 }
diff --git a/src/main/java/com/apress/progwt/client/forum/CreatePostButton.java b/src/main/java/com/apress/progwt/client/forum/CreatePostButton.java
@@ -51,7 +51,7 @@ public CreatePostButton(ForumApp app, boolean isReply,
 
     public void onClick(Widget sender) {
 
-        String secureTargetURL = "site/secure/forums.html";
+        String secureTargetURL = "secure/forums.html";
 
         // let the /secure/ page know that we should
         // fire the create action
@@ -78,7 +78,7 @@ public void onSuccess(User author) {
         // // force a login
         // if (author.getUser() == null) {
         //
-        // String base = "site/secure/forums.html";
+        // String base = "secure/forums.html";
         //
         // // let the /secure/ page know that we should
         // // fire the create action

diff --git a/src/main/java/com/apress/progwt/server/service/gwt/GWTUserServiceImpl.java b/src/main/java/com/apress/progwt/server/service/gwt/GWTUserServiceImpl.java
@@ -38,6 +38,7 @@ public UserAndToken getCurrentUser() throws BusinessException {
 
             UserAndToken rtn = userService.getCurrentUserAndToken();
 
+
             if (rtn.getUser() != null) {
                 log.info("GWT get current user... "
                         + rtn.getUser().getUsername());
@@ -56,10 +57,11 @@ public UserAndToken getCurrentUser() throws BusinessException {
 
                 rtn.setUser(fetched);
             }
+            log.debug("Returning "+rtn);
             return rtn;
 
         } catch (UsernameNotFoundException u) {
-            log.debug("No User Found " + u);
+            log.warn("No User Found " + u);
             throw new BusinessException(u);
         }
     }

diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -19,12 +19,12 @@ sonata.gears.localserver.url=http://localhost:8080/com.apress.progwt.Interactive
 #mac sample
 silvia.compass.repo=file:///var/tmp/DB/compass/toCollege
 silvia.openID.trustRoot=http://localhost:8080
-silvia.gwt.serializeEverything=true
+silvia.gwt.serializeEverything=false
 silvia.gears.localserver.dir=~/workspace/ProGWT/target/ProGWT-1.0-SNAPSHOT/com.apress.progwt.Interactive
 silvia.gears.localserver.url=http://localhost:8080/com.apress.progwt.Interactive/
 silvia.local.compass.repo=file:///var/tmp/DB/compass/toCollege
 silvia.local.openID.trustRoot=http://localhost:8080
-silvia.local.gwt.serializeEverything=true
+silvia.local.gwt.serializeEverything=false
 silvia.local.gears.localserver.dir=~/workspace/ProGWT/target/ProGWT-1.0-SNAPSHOT/com.apress.progwt.Interactive
 silvia.local.gears.localserver.url=http://localhost:8080/com.apress.progwt.Interactive/
 

diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
@@ -42,6 +42,7 @@ log4j.logger.org.springframework.test=INFO
 
 log4j.logger.com.apress=DEBUG
 log4j.logger.com.apress.progwt.server.service.impl.UserServiceImpl=INFO
+log4j.logger.com.apress.progwt.server.web.servlet.FileServlet=INFO
 #log4j.logger.org.acegisecurity.ui.openid=DEBUG
 #log4j.logger.org.acegisecurity=DEBUG
 #log4j.logger.org.openid4java=DEBUG