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

.gitignore

@@ -1,7 +1,2 @@
/.DS_Store
wade-mobile-push-yunba
general-web-server/web/WEB-INF/classes
*.iml
.idea/
out/
.project
/.DS_Store
.class

ipu-mobile-ui/.project

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>ipu-mobile-ui</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.m2e.core.maven2Builder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
		<nature>org.eclipse.m2e.core.maven2Nature</nature>
	</natures>
</projectDescription>

ipu-plugin-basic/.project

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>ipu-plugin-basic</name>
	<comment></comment>
		<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.m2e.core.maven2Builder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
		<nature>org.eclipse.m2e.core.maven2Nature</nature>
	</natures>
</projectDescription>

ipu-web-libs/.project

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>ipu-web-libs</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.m2e.core.maven2Builder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.m2e.core.maven2Nature</nature>
	</natures>
</projectDescription>

ipu-web-libs/pom.xml

@@ -0,0 +1,323 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
	<modelVersion>4.0.0</modelVersion>
	<!-- ipu-home等普通web项目继承使用 -->
	<groupId>com.ai.ipu</groupId>
	<artifactId>ipu-web-libs</artifactId>
	<version>3.0</version>
	<packaging>pom</packaging>
	<name>ipu-web-libs</name>
	<distributionManagement>
		<repository>
			<id>nexus-service-ipu-repository</id>
			<name>nexus service ipu repository</name>
			<url>http://114.215.100.48:9090/nexus/content/repositories/ipu/</url>
		</repository>
	</distributionManagement>
	
	<!-- 定义公共变量 -->
	<properties>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<encoding>UTF-8</encoding>
		<!-- Central jar -->
		<junit>3.8.1</junit>
		<servlet-api>2.5</servlet-api>
		<log4j>1.2.8</log4j>
		<unirest-java>1.3.8</unirest-java>
		<dom4j>1.6.1</dom4j>
		<jaxen>1.1.1</jaxen>
		<commons-lang3>3.4</commons-lang3>
		<beetl-core>2.2.3</beetl-core>
		<velocity>1.7</velocity>
		<jsoup>1.7.2</jsoup>
		<commons-fileupload>1.3.1</commons-fileupload>
		<commons-dbcp>1.4</commons-dbcp>
		<mysql-connector-java>5.1.39</mysql-connector-java>
		<commons-codec>1.3</commons-codec>
		<jdom>1.1.3</jdom>
		<commons-collections>3.2</commons-collections>
		<quartz-all>1.6.3</quartz-all>
		<jta>1.1</jta>
		<!-- 3rd party jar -->
		<ojdbc>14</ojdbc>
		<java_memcache-release>2.5.3</java_memcache-release>
		<amail>1.0</amail>
		<zxing>1.0</zxing>
		<!-- ipu jar -->
		<ipu>3.0</ipu>
		<wade>1.0</wade>
		<!-- 公共插件 -->
		<maven-clean-plugin>3.0.0</maven-clean-plugin>
		<maven-resources-plugin>3.0.1</maven-resources-plugin>
		<maven-compiler-plugin>3.1</maven-compiler-plugin>
		<compiler-version>1.6</compiler-version>
		<maven-surefire-plugin>2.5</maven-surefire-plugin>
		<maven-war-plugin>2.6</maven-war-plugin>
		<exec-maven-plugin>1.5.0</exec-maven-plugin>
		<maven-dependency-plugin>2.4</maven-dependency-plugin>
		<!-- 本地jar路径all -->
		<jar-path-all>${project.basedir}/all</jar-path-all>
	</properties>
	<dependencyManagement>
		<dependencies>
			<!-- Central jar -->
			<dependency>
				<groupId>commons-collections</groupId>
				<artifactId>commons-collections</artifactId>
				<version>${commons-collections}</version>
			</dependency>
			<dependency>
				<groupId>javax.transaction</groupId>
				<artifactId>jta</artifactId>
				<version>${jta}</version>
			</dependency>
			<dependency>
				<groupId>opensymphony</groupId>
				<artifactId>quartz-all</artifactId>
				<version>${quartz-all}</version>
			</dependency>
			<dependency>
				<groupId>junit</groupId>
				<artifactId>junit</artifactId>
				<version>${junit}</version>
				<scope>test</scope>
			</dependency>
			<dependency>
				<groupId>javax.servlet</groupId>
				<artifactId>servlet-api</artifactId>
				<version>${servlet-api}</version>
				<scope>provided</scope>
			</dependency>
			<dependency>
				<groupId>org.apache.commons</groupId>
				<artifactId>commons-lang3</artifactId>
				<version>${commons-lang3}</version>
			</dependency>
			<dependency>
				<groupId>log4j</groupId>
				<artifactId>log4j</artifactId>
				<version>${log4j}</version>
			</dependency>
			<dependency>
				<groupId>dom4j</groupId>
				<artifactId>dom4j</artifactId>
				<version>${dom4j}</version>
			</dependency>
			<dependency>
				<groupId>jaxen</groupId>
				<artifactId>jaxen</artifactId>
				<version>${jaxen}</version>
			</dependency>
			<dependency>
				<groupId>com.mashape.unirest</groupId>
				<artifactId>unirest-java</artifactId>
				<version>${unirest-java}</version>
			</dependency>
			<dependency>
				<groupId>org.beetl</groupId>
				<artifactId>beetl-core</artifactId>
				<version>${beetl-core}</version>
			</dependency>
			<dependency>
				<groupId>org.apache.velocity</groupId>
				<artifactId>velocity</artifactId>
				<version>${velocity}</version>
			</dependency>
			<dependency>
				<groupId>org.jsoup</groupId>
				<artifactId>jsoup</artifactId>
				<version>${jsoup}</version>
			</dependency>
			<dependency>
				<groupId>commons-fileupload</groupId>
				<artifactId>commons-fileupload</artifactId>
				<version>${commons-fileupload}</version>
			</dependency>
			<dependency>
				<groupId>commons-dbcp</groupId>
				<artifactId>commons-dbcp</artifactId>
				<version>${commons-dbcp}</version>
			</dependency>
			<dependency>
				<groupId>mysql</groupId>
				<artifactId>mysql-connector-java</artifactId>
				<version>${mysql-connector-java}</version>
			</dependency>
			<dependency>
				<groupId>commons-codec</groupId>
				<artifactId>commons-codec</artifactId>
				<version>${commons-codec}</version>
			</dependency>
			<dependency>
				<groupId>org.jdom</groupId>
				<artifactId>jdom</artifactId>
				<version>${jdom}</version>
			</dependency>
			<!-- 3rd party jar -->
			<dependency>
				<groupId>com</groupId>
				<artifactId>java_memcache-release</artifactId>
				<version>${java_memcache-release}</version>
			</dependency>
			<dependency>
				<groupId>com.amail</groupId>
				<artifactId>amail</artifactId>
				<version>${amail}</version>
			</dependency>
			<dependency>
				<groupId>com.zxing</groupId>
				<artifactId>zxing</artifactId>
				<version>${zxing}</version>
			</dependency>
			<dependency>
				<groupId>ojdbc</groupId>
				<artifactId>ojdbc</artifactId>
				<version>${ojdbc}</version>
			</dependency>
			<!-- ipu jar -->
			<dependency>
				<groupId>com.ai.ipu</groupId>
				<artifactId>ipu-basic</artifactId>
				<version>${ipu}</version>
			</dependency>
			<dependency>
				<groupId>com.ai.ipu</groupId>
				<artifactId>ipu-common</artifactId>
				<version>${ipu}</version>
			</dependency>
			<dependency>
				<groupId>com.ai.ipu</groupId>
				<artifactId>ipu-database</artifactId>
				<version>${ipu}</version>
			</dependency>
			<dependency>
				<groupId>com.ai.ipu</groupId>
				<artifactId>ipu-remote-clinet</artifactId>
				<version>${ipu}</version>
			</dependency>
			<dependency>
				<groupId>com.ai.ipu</groupId>
				<artifactId>ipu-server-web</artifactId>
				<version>${ipu}</version>
			</dependency>
			<dependency>
				<!-- 不推荐使用，推荐使用wade-mobile-data -->
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-data</artifactId>
				<version>${wade}</version>
			</dependency>
			<dependency>
				<!-- 不依赖其他jar -->
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-mobile-data</artifactId>
				<version>${wade}</version>
			</dependency>
			<dependency>
				<!-- commons-collections-3.2.jar,quartz-all-1.6.3.jar,jdom1.0.jar,wade-apache,wade-common,wade-mobile-data -->
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-cache</artifactId>
				<version>${wade}</version>
			</dependency>
			<dependency>
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-apache</artifactId>
				<version>${wade}</version>
			</dependency>
			<dependency>
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-common</artifactId>
				<version>${wade}</version>
			</dependency>
			<dependency>
				<!-- commons-dbcp-1.4.jar,dom4j-1.6.1.jar,jaxen-1.1.1.jar,jta.jar,ojdbc14.jar,mysql-connector-5.1.39.jar,wade-apache,wade-cache,wade-common,wade-mobile-data -->
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-database</artifactId>
				<version>${wade}</version>
			</dependency>
			<dependency>
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-sqlite-jdbc</artifactId>
				<version>${wade}</version>
			</dependency>
			<dependency>
				<!-- ipu-basic,ipu-server-web,wade-apache,wade-cache,wade-common,wade-database,wade-mobile-data -->
				<groupId>com.ai.wade</groupId>
				<artifactId>wade-codecode</artifactId>
				<version>${wade}</version>
			</dependency>
		</dependencies>
	</dependencyManagement>
	<build>
		<pluginManagement>
			<plugins>
				<plugin>
					<groupId>org.apache.maven.plugins</groupId>
					<artifactId>maven-clean-plugin</artifactId>
					<version>${maven-clean-plugin}</version>
				</plugin>
				<!-- 默认jre编译版本 -->
				<plugin>
					<groupId>org.apache.maven.plugins</groupId>
					<artifactId>maven-compiler-plugin</artifactId>
					<version>${maven-compiler-plugin}</version>
					<configuration>
						<source>${compiler-version}</source>
						<target>${compiler-version}</target>
					</configuration>
				</plugin>
				<!-- 由于配置了<packaging>war</packaging>，插件maven-war-plugin默认调用 -->
				<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> 
					<version>${maven-war-plugin}</version> </plugin> -->
				<plugin>
					<groupId>org.apache.maven.plugins</groupId>
					<artifactId>maven-surefire-plugin</artifactId>
					<version>${maven-surefire-plugin}</version>
					<configuration>
						<!-- 跳过单元测试 -->
						<skip>true</skip>
					</configuration>
				</plugin>
				<!-- 复制资源 -->
				<plugin>
					<groupId>org.apache.maven.plugins</groupId>
					<artifactId>maven-resources-plugin</artifactId>
					<version>${maven-resources-plugin}</version>
				</plugin>
				<!-- 复制lib包在这一步 -->
				<plugin>
					<groupId>org.apache.maven.plugins</groupId>
					<artifactId>maven-dependency-plugin</artifactId>
					<version>${maven-dependency-plugin}</version>
					<executions>
						<execution>
							<id>copy-dep</id>
							<phase>package</phase>
							<goals>
								<goal>copy-dependencies</goal>
							</goals>
							<configuration>
								<outputDirectory>${basedir}/src/main/webapp/WEB-INF/lib</outputDirectory>
								<excludeScope>provided</excludeScope>
								<excludeArtifactIds>junit</excludeArtifactIds>
							</configuration>
						</execution>
					</executions>
				</plugin>
			</plugins>
		</pluginManagement>
		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
	</build>
</project>