Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

ipu-server工程修复
Conflicts:
	wade-mobile-common/.classpath
	wade-mobile-common/libs/wade-mobile-com.jar

ipu-server/src/com/ipu/server/bean/IndexBean.java

@@ -1,10 +1,10 @@
package com.ipu.server.bean;
import com.ai.ipu.server.frame.bean.AbstractBean;
import com.ailk.common.data.IData;
import com.ailk.common.data.IDataset;
import com.ailk.common.data.impl.DataMap;
import com.ailk.common.data.impl.DatasetList;
import com.ailk.mobile.frame.bean.AbstractBean;
public class IndexBean extends AbstractBean {
	//ACTION为null时候页面不显示

ipu-server/src/com/ipu/server/bean/LoginBean.java

@@ -2,10 +2,9 @@ package com.ipu.server.bean;
import java.awt.image.BufferedImage;
import com.ai.ipu.server.util.MobileUtility;
import com.ailk.common.data.IData;
import com.ailk.common.data.IDataset;
import com.ailk.common.data.impl.DataMap;
import com.ailk.mobile.util.MobileUtility;
import com.ipu.server.core.bean.IpuAppBean;
import com.ipu.server.core.context.IpuContextData;
import com.ipu.server.core.session.IpuSessionManager;

ipu-server/src/com/ipu/server/core/bean/IpuAppBean.java

@@ -1,6 +1,6 @@
package com.ipu.server.core.bean;
import com.ailk.mobile.frame.bean.AbstractBean;
import com.ai.ipu.server.frame.bean.AbstractBean;
import com.ipu.server.core.context.IpuContextData;
public class IpuAppBean extends AbstractBean {

ipu-server/src/com/ipu/server/core/context/IpuContextData.java

@@ -1,6 +1,6 @@
package com.ipu.server.core.context;
import com.ailk.mobile.frame.context.impl.DefaultContextData;
import com.ai.ipu.server.frame.context.impl.DefaultContextData;
@SuppressWarnings("serial")
public class IpuContextData extends DefaultContextData {

ipu-server/src/com/ipu/server/core/handle/IpuExceptionHandler.java

@@ -1,9 +1,9 @@
package com.ipu.server.core.handle;
import com.ailk.mobile.frame.handle.impl.DefaultExceptionHandler;
import com.ailk.mobile.servlet.ServletManager;
import com.ailk.mobile.util.MobileConstant;
import com.ailk.mobile.util.MobileServerException;
import com.ai.ipu.server.frame.handle.impl.DefaultExceptionHandler;
import com.ai.ipu.server.servlet.ServletManager;
import com.ai.ipu.server.util.MobileConstant;
import com.ai.ipu.server.util.MobileServerException;
public class IpuExceptionHandler extends DefaultExceptionHandler {
	/**

ipu-server/src/com/ipu/server/core/handle/IpuSecurityHandler.java

@@ -1,6 +1,6 @@
package com.ipu.server.core.handle;
import com.ailk.mobile.frame.handle.impl.DefaultSecurityHandler;
import com.ai.ipu.server.frame.handle.impl.DefaultSecurityHandler;
public class IpuSecurityHandler extends DefaultSecurityHandler{
	

ipu-server/src/com/ipu/server/core/session/IpuSessionManager.java

@@ -1,9 +1,9 @@
package com.ipu.server.core.session;
import com.ai.ipu.server.frame.context.IContextData;
import com.ai.ipu.server.frame.session.impl.AbstractSessionManager;
import com.ai.ipu.server.util.MobileUtility;
import com.ailk.common.data.IData;
import com.ailk.mobile.frame.context.IContextData;
import com.ailk.mobile.frame.session.impl.AbstractSessionManager;
import com.ailk.mobile.util.MobileUtility;
import com.ipu.server.core.context.IpuContextData;
public class IpuSessionManager extends AbstractSessionManager {

ipu-server/src/com/ipu/server/dao/UserDao.java

@@ -1,7 +1,7 @@
package com.ipu.server.dao;
import com.ai.ipu.server.db.dao.impl.BaseDAO;
import com.ailk.common.data.IData;
import com.ailk.mobile.db.dao.impl.BaseDAO;
public class UserDao extends BaseDAO
{