Author: blee
Date: Wed May 30 18:44:14 2012
New Revision: 1344408
URL: http://svn.apache.org/viewvc?rev=1344408&view=rev
Log:
SQOOP-365 Sqoop distribution automation with maven
Added:
sqoop/branches/sqoop2/dist/src/
sqoop/branches/sqoop2/dist/src/main/
sqoop/branches/sqoop2/dist/src/main/bin/
sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh (with props)
sqoop/branches/sqoop2/dist/src/main/server/
sqoop/branches/sqoop2/dist/src/main/server/bin/
sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.bat (with props)
sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.sh (with props)
sqoop/branches/sqoop2/dist/src/main/server/conf/
sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties (with
props)
sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
(with props)
sqoop/branches/sqoop2/dist/src/main/server/webapps/
sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/
sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/
sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/web.xml
(with props)
sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/index.html (with
props)
Modified:
sqoop/branches/sqoop2/client/pom.xml
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/request/VersionRequest.java
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java
sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java
sqoop/branches/sqoop2/dist/pom.xml
sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml
sqoop/branches/sqoop2/server/src/main/webapp/index.html
Modified: sqoop/branches/sqoop2/client/pom.xml
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/client/pom.xml?rev=1344408&r1=1344407&r2=1344408&view=diff
==============================================================================
--- sqoop/branches/sqoop2/client/pom.xml (original)
+++ sqoop/branches/sqoop2/client/pom.xml Wed May 30 18:44:14 2012
@@ -68,4 +68,33 @@ limitations under the License.
<version>1.8.5</version>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>dist</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified:
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/request/VersionRequest.java
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/request/VersionRequest.java?rev=1344408&r1=1344407&r2=1344408&view=diff
==============================================================================
---
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/request/VersionRequest.java
(original)
+++
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/request/VersionRequest.java
Wed May 30 18:44:14 2012
@@ -23,7 +23,7 @@ import org.json.simple.JSONValue;
public class VersionRequest extends Request
{
- public VersionBean versions(String url) {
+ public VersionBean version(String url) {
String response = get(url + "version");
JSONObject jsonObject = (JSONObject)JSONValue.parse(response);
Modified:
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java?rev=1344408&r1=1344407&r2=1344408&view=diff
==============================================================================
---
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java
(original)
+++
sqoop/branches/sqoop2/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java
Wed May 30 18:44:14 2012
@@ -29,7 +29,7 @@ public class SetCommand extends SqoopCom
protected SetCommand(Shell shell) {
super(shell, "set", "\\st",
- new String[] {"server", "client"},
+ new String[] {"server", "connector"},
"Set", "info");
}
Modified:
sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java?rev=1344408&r1=1344407&r2=1344408&view=diff
==============================================================================
---
sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java
(original)
+++
sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java
Wed May 30 18:44:14 2012
@@ -17,8 +17,6 @@
*/
package org.apache.sqoop.json;
-import java.util.Arrays;
-
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
@@ -106,8 +104,8 @@ public class VersionBean implements Json
return this.url;
}
- public String getProtocols() {
- return Arrays.toString(protocols);
+ public String[] getProtocols() {
+ return this.protocols;
}
}
Modified: sqoop/branches/sqoop2/dist/pom.xml
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/pom.xml?rev=1344408&r1=1344407&r2=1344408&view=diff
==============================================================================
--- sqoop/branches/sqoop2/dist/pom.xml (original)
+++ sqoop/branches/sqoop2/dist/pom.xml Wed May 30 18:44:14 2012
@@ -30,4 +30,93 @@ limitations under the License.
<groupId>org.apache.sqoop</groupId>
<artifactId>sqoop-dist</artifactId>
<name>Sqoop Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sqoop</groupId>
+ <artifactId>sqoop-server</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sqoop</groupId>
+ <artifactId>sqoop-client</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>dist</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- clean up -->
+ <delete dir="target/sqoop-${project.version}"/>
+ <delete file="target/sqoop-${project.version}.tar.gz"/>
+ <!-- create dist dir -->
+ <mkdir dir="target/sqoop-${project.version}"/>
+
+ <!-- server -->
+ <get
src="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.tar.gz";
+ dest="target/apache-tomcat.tar.gz" verbose="true"
skipexisting="true"/>
+ <untar src="target/apache-tomcat.tar.gz" dest="target"
compression="gzip"/>
+ <delete file="target/apache-tomcat.tar.gz"/>
+ <move file="target/apache-tomcat-7.0.27"
tofile="target/sqoop-${project.version}/server"/>
+ <copy todir="target/sqoop-${project.version}/server/bin">
+ <fileset dir="src/main/server/bin"/>
+ </copy>
+ <chmod dir="target/sqoop-${project.version}/server/bin"
perm="u+x" includes="**/*.sh"/>
+ <copy todir="target/sqoop-${project.version}/server/conf">
+ <fileset dir="src/main/server/conf"/>
+ </copy>
+ <delete
dir="target/sqoop-${project.version}/server/webapps"/>
+ <mkdir
dir="target/sqoop-${project.version}/server/webapps"/>
+ <copy
todir="target/sqoop-${project.version}/server/webapps">
+ <fileset dir="src/main/server/webapps"/>
+ </copy>
+ <copy file="../server/target/sqoop.war"
+
toDir="target/sqoop-${project.version}/server/webapps"/>
+
+ <!-- client -->
+ <copy todir="target/sqoop-${project.version}/client/lib">
+ <fileset dir="../client/target/lib"/>
+ </copy>
+ <copy
file="../client/target/sqoop-client-${project.version}.jar"
+ toDir="target/sqoop-${project.version}/client/lib"/>
+
+ <!-- binary -->
+ <copy todir="target/sqoop-${project.version}/bin">
+ <fileset dir="src/main/bin"/>
+ </copy>
+ <chmod dir="target/sqoop-${project.version}/bin"
perm="u+x" includes="**/*.sh"/>
+
+ <!-- create dist tar -->
+ <tar destfile="target/sqoop-${project.version}.tar.gz"
compression="gzip">
+ <tarfileset dir="target/sqoop-${project.version}"
prefix="sqoop-${project.version}"/>
+ </tar>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Added: sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh?rev=1344408&view=auto
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh (added)
+++ sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh Wed May 30 18:44:14 2012
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+function print_usage(){
+ echo "Usage: sqoop.sh COMMAND"
+ echo " where COMMAND is one of:"
+ echo " server <start/stop> Start/stop the server"
+ echo " client [script] Start an interactive shell without a script"
+ echo " or run a script with a batch shell"
+ echo ""
+}
+
+if [ $# = 0 ]; then
+ print_usage
+ exit
+fi
+
+OLD_DIR=`pwd`
+CUR_DIR=`cd $(dirname $(which $0))/..; pwd`
+cd ${CUR_DIR}
+echo "Sqoop home directory: ${CUR_DIR}..."
+
+COMMAND=$1
+case $COMMAND in
+ server)
+ if [ $# = 1 ]; then
+ echo "Usage: sqoop.sh server <start/stop>"
+ exit
+ fi
+
+ server/bin/catalina.sh $2
+ ;;
+
+ client)
+ for f in client/lib/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+
+ java -classpath ${CLASSPATH} org.apache.sqoop.client.shell.SqoopShell $2
+ ;;
+
+ *)
+ echo "Command is not recognized."
+ ;;
+esac
+
+cd ${OLD_DIR}
Propchange: sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh
------------------------------------------------------------------------------
svn:executable = *
Added: sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.bat
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.bat?rev=1344408&view=auto
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.bat (added)
+++ sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.bat Wed May 30
18:44:14 2012
@@ -0,0 +1,17 @@
+::
+:: Licensed to the Apache Software Foundation (ASF) under one or more
+:: contributor license agreements. See the NOTICE file distributed with
+:: this work for additional information regarding copyright ownership.
+:: The ASF licenses this file to You under the Apache License, Version 2.0
+:: (the "License"); you may not use this file except in compliance with
+:: the License. You may obtain a copy of the License at
+::
+:: http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+::
+set JAVA_OPTS=-Dsqoop.config.dir=%~dp0
\ No newline at end of file
Propchange: sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.bat
------------------------------------------------------------------------------
svn:eol-style = native
Added: sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.sh
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.sh?rev=1344408&view=auto
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.sh (added)
+++ sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.sh Wed May 30
18:44:14 2012
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+JAVA_OPTS=-Dsqoop.config.dir=`dirname $0`/../conf
Propchange: sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sqoop/branches/sqoop2/dist/src/main/server/bin/setenv.sh
------------------------------------------------------------------------------
svn:executable = *
Added: sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties?rev=1344408&view=auto
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties (added)
+++ sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties Wed May 30
18:44:14 2012
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Log4J system
+org.apache.sqoop.log4j.appender.file=org.apache.log4j.RollingFileAppender
+org.apache.sqoop.log4j.appender.file.File=logs/sqoop.log
+org.apache.sqoop.log4j.appender.file.MaxFileSize=25MB
+org.apache.sqoop.log4j.appender.file.MaxBackupIndex=5
+org.apache.sqoop.log4j.appender.file.layout=org.apache.log4j.PatternLayout
+org.apache.sqoop.log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %-5p
%c{2} [%l] %m%n
+org.apache.sqoop.log4j.debug=true
+org.apache.sqoop.log4j.rootCategory=WARN, file
+org.apache.sqoop.log4j.category.org.apache.sqoop=DEBUG
+org.apache.sqoop.log4j.category.org.apache.derby=INFO
+
+# Repository
+org.apache.sqoop.repository.provider=org.apache.sqoop.repository.JdbcRepositoryProvider
+org.apache.sqoop.repository.jdbc.handler=org.apache.sqoop.repository.derby.DerbyRepositoryHandler
+org.apache.sqoop.repository.jdbc.transaction.isolation=READ_COMMITTED
+org.apache.sqoop.repository.jdbc.maximum.connections=10
+org.apache.sqoop.repository.jdbc.url=jdbc:derby:repository/db;create=true
+org.apache.sqoop.repository.jdbc.create.schema=true
+org.apache.sqoop.repository.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+org.apache.sqoop.repository.jdbc.user=sa
+org.apache.sqoop.repository.jdbc.password=
+org.apache.sqoop.repository.sysprop.derby.stream.error.file=logs/derbyrepo.log
Propchange: sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties
------------------------------------------------------------------------------
svn:executable = *
Propchange: sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties?rev=1344408&view=auto
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
(added)
+++ sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
Wed May 30 18:44:14 2012
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+sqoop.config.provider=org.apache.sqoop.core.PropertiesConfigurationProvider
Propchange:
sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
------------------------------------------------------------------------------
svn:executable = *
Propchange:
sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/web.xml?rev=1344408&view=auto
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/web.xml
(added)
+++ sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/web.xml Wed
May 30 18:44:14 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+ 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_3_0.xsd";
+ version="3.0"
+ metadata-complete="true">
+
+ <display-name>ROOT</display-name>
+
+</web-app>
Propchange:
sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/index.html
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/index.html?rev=1344408&view=auto
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/index.html (added)
+++ sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/index.html Wed May
30 18:44:14 2012
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+ <head><title>Apache Sqoop ROOT</title></head>
+ <body>
+ Apache Sqoop ROOT
+ </body>
+</html>
Propchange: sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sqoop/branches/sqoop2/dist/src/main/server/webapps/ROOT/index.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml?rev=1344408&r1=1344407&r2=1344408&view=diff
==============================================================================
--- sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml (original)
+++ sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml Wed May 30
18:44:14 2012
@@ -38,5 +38,16 @@ limitations under the License.
<url-pattern>/version</url-pattern>
</servlet-mapping>
+ <servlet>
+ <servlet-name>v1.ConnectorServlet</servlet-name>
+ <servlet-class>org.apache.sqoop.server.v1.ConnectorServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>v1.ConnectorServlet</servlet-name>
+ <url-pattern>/v1/connector</url-pattern>
+ </servlet-mapping>
+
</web-app>
Modified: sqoop/branches/sqoop2/server/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/sqoop/branches/sqoop2/server/src/main/webapp/index.html?rev=1344408&r1=1344407&r2=1344408&view=diff
==============================================================================
--- sqoop/branches/sqoop2/server/src/main/webapp/index.html (original)
+++ sqoop/branches/sqoop2/server/src/main/webapp/index.html Wed May 30 18:44:14
2012
@@ -16,8 +16,8 @@ See the License for the specific languag
limitations under the License.
-->
<html>
-<head><title>Apache Sqoop</title></head>
-<body>
-Apache Sqoop
-</body>
+ <head><title>Apache Sqoop Server</title></head>
+ <body>
+ Apache Sqoop Server
+ </body>
</html>
