Author: dongxu
Date: Thu Sep 12 03:41:40 2013
New Revision: 1522235
URL: http://svn.apache.org/r1522235
Log:
integrate them as a whole one - first: make the default place work
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java Thu
Sep 12 03:41:40 2013
@@ -46,11 +46,15 @@ public class Hupa implements EntryPoint
private void initApp() {
replaceLoading();
<<<<<<< HEAD
+<<<<<<< HEAD
injector.getHupaController().start();
=======
HupaController hupaController = injector.getHupaController();
hupaController.start();
>>>>>>> move new theme ui from experiment to hupa evo
+=======
+ injector.getHupaController().start();
+>>>>>>> integrate them as a whole one - first: make the default place work
}
private void handleExceptionsAsync() {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java
Thu Sep 12 03:41:40 2013
@@ -19,7 +19,7 @@
package org.apache.hupa.client;
-import org.apache.hupa.client.ui.HupaLayoutable;
+import org.apache.hupa.client.ui.LoginLayoutable;
import com.google.gwt.activity.shared.ActivityManager;
import com.google.inject.Inject;
@@ -32,8 +32,9 @@ import com.google.inject.name.Named;
public class HupaActivityManagerInitializer {
@Inject
- public HupaActivityManagerInitializer(HupaLayoutable layout,
- @Named("LoginPage") ActivityManager
loginActivityManager) {
+ public HupaActivityManagerInitializer(LoginLayoutable layout
+ ,@Named("LoginPage") ActivityManager
loginActivityManager
+ ) {
loginActivityManager.setDisplay(layout.getLoginView());
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
Thu Sep 12 03:41:40 2013
@@ -51,6 +51,7 @@ import org.apache.hupa.client.place.Mail
import org.apache.hupa.client.rf.CheckSessionRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.ui.HupaLayoutable;
+import org.apache.hupa.client.ui.LoginLayoutable;
>>>>>>> move new theme ui from experiment to hupa evo
import com.google.gwt.dom.client.StyleInjector;
@@ -91,6 +92,7 @@ public class HupaController {
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
+import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class HupaController {
@@ -99,6 +101,8 @@ public class HupaController {
@Inject private PlaceController placeController;
@Inject private HupaRequestFactory requestFactory;
private Place currentPlace;
+
+ @Inject private LoginLayoutable loginLayout;
@Inject
<<<<<<< HEAD
@@ -113,6 +117,7 @@ public class HupaController {
public void start() {
<<<<<<< HEAD
+<<<<<<< HEAD
bindCss();
placeHistoryHandler.handleCurrentHistory();
}
@@ -236,12 +241,22 @@ public class HupaController {
// need
// this?
RootLayoutPanel.get().add(hupaLayout.get());
+=======
+ bindCss();
+ checkSession();
+>>>>>>> integrate them as a whole one - first: make the default place work
placeHistoryHandler.handleCurrentHistory();
}
+ private void bindCss() {
+ // TODO:replace with a more gentle approach
+
StyleInjector.inject(HupaResources.INSTANCE.stylesheet().getText());
+ }
+
private final class PlaceChangHandler implements
PlaceChangeEvent.Handler {
@Override
public void onPlaceChange(PlaceChangeEvent event) {
+
if (placeChange(event)) {
checkSession();
}
@@ -259,19 +274,21 @@ public class HupaController {
currentPlace = newPlace;
}
}
-
- private void checkSession() {
- CheckSessionRequest checkSession =
requestFactory.sessionRequest();
- checkSession.isValid().fire(new Receiver<Boolean>() {
- @Override
- public void onSuccess(Boolean sessionValid) {
- if (!sessionValid) {
-
HupaController.this.placeController
- .goTo(new
DefaultPlace());
- }
- }
- });
- }
+//
+// private void checkSession() {
+// CheckSessionRequest checkSession =
requestFactory.sessionRequest();
+// checkSession.isValid().fire(new Receiver<Boolean>() {
+// @Override
+// public void onSuccess(Boolean sessionValid) {
+// if (!sessionValid) {
+//
RootLayoutPanel.get().add(loginLayout.get());//
+//
HupaController.this.placeController
+// .goTo(new
DefaultPlace());
+// // this?
+// }
+// }
+// });
+// }
private boolean placeChange(PlaceChangeEvent event) {
return currentPlace != null
@@ -285,5 +302,31 @@ public class HupaController {
}
}
+<<<<<<< HEAD
>>>>>>> move new theme ui from experiment to hupa evo
+=======
+ private void checkSession() {
+ CheckSessionRequest checkSession =
requestFactory.sessionRequest();
+ checkSession.isValid().fire(new Receiver<Boolean>() {
+ @Override
+ public void onSuccess(Boolean sessionValid) {
+ RootLayoutPanel.get().clear();
+ RootLayoutPanel.get().add(loginLayout.get());//
+ if (!sessionValid) {
+// RootLayoutPanel.get().clear();
+//
RootLayoutPanel.get().add(loginLayout.get());//
+// HupaController.this.placeController
+// .goTo(new
DefaultPlace());
+ // this?
+ }
+ }
+
+ @Override
+ public void onFailure(ServerFailure error){
+ RootLayoutPanel.get().clear();
+ RootLayoutPanel.get().add(loginLayout.get());
+ }
+ });
+ }
+>>>>>>> integrate them as a whole one - first: make the default place work
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css
Thu Sep 12 03:41:40 2013
@@ -92,6 +92,7 @@
.loginForm .submitButton {
background-color: white;
font-size: 110%;
+ font-weight: bold;
padding: 4px 12px;
color: #000;
text-decoration: hand;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Thu Sep 12 03:41:40 2013
@@ -38,9 +38,12 @@ import java.util.logging.Logger;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import org.apache.hupa.client.HupaConstants;
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+>>>>>>> integrate them as a whole one - first: make the default place work
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.activity.ComposeActivity;
import org.apache.hupa.client.activity.ComposeToolBarActivity;
@@ -182,6 +185,8 @@ import org.apache.hupa.client.ui.IMAPMes
=======
>>>>>>> 1. improve the inbox folder place.
import org.apache.hupa.client.ui.IMAPMessageView;
+import org.apache.hupa.client.ui.LoginLayout;
+import org.apache.hupa.client.ui.LoginLayoutable;
import org.apache.hupa.client.ui.LoginView;
import org.apache.hupa.client.ui.MessageSendView;
import org.apache.hupa.client.ui.MessagesCellTable;
@@ -411,7 +416,11 @@ public class AppGinModule extends Abstra
>>>>>>> refactoring
=======
bind(HupaLayoutable.class).to(HupaLayout.class).in(Singleton.class);
+<<<<<<< HEAD
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+
bind(LoginLayoutable.class).to(LoginLayout.class).in(Singleton.class);
+>>>>>>> integrate them as a whole one - first: make the default place work
// Activities
bind(LoginActivity.Displayable.class).to(LoginView.class);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
Thu Sep 12 03:41:40 2013
@@ -228,15 +228,15 @@ public class HupaLayout implements HupaL
=======
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
+<<<<<<< HEAD
import com.google.gwt.uibinder.client.UiField;
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+>>>>>>> integrate them as a whole one - first: make the default place work
import com.google.gwt.user.client.ui.LayoutPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
public class HupaLayout implements HupaLayoutable {
- @UiField SimplePanel loginView;
-
@Override
public LayoutPanel get() {
return binder.createAndBindUi(this);
@@ -248,10 +248,6 @@ public class HupaLayout implements HupaL
private static HupaLayoutUiBinder binder = GWT
.create(HupaLayoutUiBinder.class);
- @Override
- public SimplePanel getLoginView(){
- return loginView;
- }
<<<<<<< HEAD
public interface HupaLayout {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
Thu Sep 12 03:41:40 2013
@@ -79,16 +79,15 @@
}
</ui:style>
<g:LayoutPanel addStyleNames="{style.minWidth}">
- <g:layer>
- <g:SimplePanel ui:field="loginView">
- <hupa:LoginView/>
- </g:SimplePanel>
- </g:layer> <!--
<g:layer left='0' right='0' top='0' height='92px'>
<g:DockLayoutPanel unit="PX" ui:field="Header">
<g:north size="23">
+<<<<<<< HEAD
<hupa:TopBarView />
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ <hupa:TopBarView ui:field="topBarView"/>
+>>>>>>> integrate them as a whole one - first: make the default place work
</g:north>
<g:center>
<g:LayoutPanel
addStyleNames="{style.feature}"
@@ -105,9 +104,10 @@
<g:SimpleLayoutPanel
ui:field="navigationContainer" />
=======
<g:layer width="177px"
left="10px">
- <hupa:LogoView />
+ <hupa:LogoView
ui:field="logoView"/>
</g:layer>
<g:layer width="301px"
right="0">
+<<<<<<< HEAD
<hupa:NavigationView />
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
</g:layer>
@@ -128,6 +128,9 @@
</g:layer>
<g:layer left="0%" width="0%"
top="0%" height="0%">
<hupa:_CenterSettingPanel ui:field="settingPanel" />
+=======
+ <hupa:NavigationView
ui:field="navigationView"/>
+>>>>>>> integrate them as a whole one - first: make the default place work
</g:layer>
<g:layer left="0%" width="0%" top="0%" height="0%">
<hupa:_CenterContactPanel ui:field="contactPanel"
/>
@@ -143,7 +146,7 @@
<g:layer left='10px' right='10px' top='88px' bottom="20px">
<g:DockLayoutPanel ui:field="MainBox">
<g:north size="40">
- <hupa:ToolBarView />
+ <hupa:ToolBarView
ui:field="toolBarView"/>
</g:north>
<g:center>
<g:SplitLayoutPanel
ui:field="MessageSpace">
@@ -151,7 +154,7 @@
<g:LayoutPanel
ui:field="LeftBox"
addStyleNames="{style.folderList} {style.box} {style.listBox}">
<g:layer
top="0" height="100%">
-
<hupa:FolderListView />
+
<hupa:FolderListView ui:field="folderListView"/>
</g:layer>
<g:layer
bottom="0" height="41px">
<g:SimplePanel styleName="{style.boxFooter}">
@@ -169,10 +172,10 @@
<g:LayoutPanel addStyleNames="{style.box}"
ui:field="MessageListBox">
<g:layer>
-
<hupa:MessageListView />
+
<hupa:MessageListView ui:field="messageView"/>
</g:layer>
<g:layer bottom="0" height="25px">
-
<hupa:MessageListFooterView />
+
<hupa:MessageListFooterView
ui:field="messageListFooterView"/>
</g:layer>
</g:LayoutPanel>
</g:north>
@@ -180,10 +183,10 @@
<g:LayoutPanel addStyleNames="{style.box}"
ui:field="MessageContentBox">
<g:layer>
-
<hupa:MessageContentView />
+
<hupa:MessageContentView ui:field="messageContentView"/>
</g:layer>
<g:layer bottom="0" height="25px">
-
<hupa:StatusView />
+
<hupa:StatusView ui:field="statusView"/>
</g:layer>
</g:LayoutPanel>
</g:center>
@@ -212,7 +215,11 @@
</g:SplitLayoutPanel>
</g:center>
</g:DockLayoutPanel>
+<<<<<<< HEAD
</g:layer> -->
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ </g:layer>
+>>>>>>> integrate them as a whole one - first: make the default place work
</g:LayoutPanel>
</ui:UiBinder>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
Thu Sep 12 03:41:40 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.ui;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -77,4 +78,8 @@ public interface HupaLayoutable {
SimplePanel getLoginView();
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+
+public interface HupaLayoutable extends Layoutable{
+>>>>>>> integrate them as a whole one - first: make the default place work
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java
Thu Sep 12 03:41:40 2013
@@ -31,6 +31,7 @@ import com.google.gwt.user.client.ui.Wid
public class LoginLayout implements LoginLayoutable {
@UiField SimplePanel loginContainer;
+<<<<<<< HEAD
private LayoutPanel loginMainPanel;
@@ -48,6 +49,29 @@ public class LoginLayout implements Logi
};
}
+=======
+
+ private LayoutPanel loginMainPanel;
+
+ public LoginLayout(){
+ this.loginMainPanel = binder.createAndBindUi(this);
+ }
+
+ @Override
+ public AcceptsOneWidget getLoginView(){
+ return new AcceptsOneWidget() {
+ @Override
+ public void setWidget(IsWidget w) {
+ Widget widget = Widget.asWidgetOrNull(w);
+ if(widget != null){
+ loginContainer.add(widget);
+ }
+ }
+ };
+
+ }
+
+>>>>>>> integrate them as a whole one - first: make the default place work
@Override
public LayoutPanel get() {
return loginMainPanel;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
Thu Sep 12 03:41:40 2013
@@ -503,21 +503,14 @@ public class LoginView extends Composite
.create(LoginViewUiBinder.class);
Css css = HupaResources.INSTANCE.stylesheet();
- @UiField
- FlowPanel mainContainer;
- @UiField
- FlowPanel innerBox;
- @UiField
- Button loginButton;
+ @UiField FlowPanel mainContainer;
+ @UiField FlowPanel innerBox;
+ @UiField Button loginButton;
private SubmitButton submitButton;
- @UiField
- FlexTable flexTable;
- @UiField
- FlowPanel boxBottom;
- @UiField
- FlowPanel messageBox;
- @UiField
- FlowPanel bottomLine;
+ @UiField FlexTable flexTable;
+ @UiField FlowPanel boxBottom;
+ @UiField FlowPanel messageBox;
+ @UiField FlowPanel bottomLine;
PPanel buttonBar = new PPanel();
// We wrap login/password boxes with a form which must be in the html
// document,
@@ -527,8 +520,7 @@ public class LoginView extends Composite
private PasswordTextBox passwordTextBox = PasswordTextBox.wrap(DOM
.getElementById("password"));
// wrap the form after inputs so as they are in the dom when are wrapped
- @UiField
- FormPanel formPanel;
+ @UiField FormPanel formPanel;
>>>>>>> replace with uibinder
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
Thu Sep 12 03:41:40 2013
@@ -161,7 +161,7 @@
<g:FlowPanel ui:field="innerBox">
<g:Image resource='{logo}'></g:Image>
<g:FormPanel ui:field="formPanel">
- <g:FlexTable ui:field="flexTable"></g:FlexTable>
+ <g:FlexTable ui:field="flexTable"/>
</g:FormPanel>
<g:Button ui:field="loginButton"></g:Button>
</g:FlowPanel>
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg?rev=1522235&view=auto
==============================================================================
Files
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg
(added) and
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg
Thu Sep 12 03:41:40 2013 differ
Modified: james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml?rev=1522235&r1=1522234&r2=1522235&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml (original)
+++ james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml Thu Sep 12 03:41:40
2013
@@ -16,11 +16,15 @@
-->
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> integrate them as a whole one - first: make the default place work
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee";>
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -33,6 +37,8 @@
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> integrate them as a whole one - first: make the default place work
<!-- Max size of the upload request (10MB) -->
<context-param>
@@ -87,11 +93,15 @@
<welcome-file-list>
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<welcome-file>index.jsp</welcome-file>
=======
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+ <welcome-file>index.jsp</welcome-file>
+>>>>>>> integrate them as a whole one - first: make the default place work
<welcome-file>Hupa.html</welcome-file>
</welcome-file-list>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
