You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/07/31 18:42:54 UTC

svn commit: r561387 - in /webservices/axis2/trunk/java: modules/distribution/ modules/distribution/src/main/assembly/ modules/documentation/ modules/samples/userguide/src/userguide/loggingmodule/META-INF/ modules/tool/script/ modules/webapp/conf/ modul...

Author: dims
Date: Tue Jul 31 09:42:49 2007
New Revision: 561387

URL: http://svn.apache.org/viewvc?view=rev&rev=561387
Log:
Run bin dist thru Apache RAT

Modified:
    webservices/axis2/trunk/java/modules/distribution/   (props changed)
    webservices/axis2/trunk/java/modules/distribution/distribution.iml
    webservices/axis2/trunk/java/modules/distribution/pom.xml
    webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
    webservices/axis2/trunk/java/modules/documentation/   (props changed)
    webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/loggingmodule/META-INF/MANIFEST.MF
    webservices/axis2/trunk/java/modules/tool/script/java2wsdl.bat
    webservices/axis2/trunk/java/modules/tool/script/wsdl2java.bat
    webservices/axis2/trunk/java/modules/webapp/conf/modules.list
    webservices/axis2/trunk/java/modules/webapp/conf/services.list
    webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminfooter.inc
    webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminheader.inc
    webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/footer.inc
    webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/header.inc
    webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/link-footer.inc
    webservices/axis2/trunk/java/release-docs/readme-files/installation-std-bin.txt

Propchange: webservices/axis2/trunk/java/modules/distribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 09:42:49 2007
@@ -0,0 +1,4 @@
+*.iml
+*.iws
+*.ipr
+target

Modified: webservices/axis2/trunk/java/modules/distribution/distribution.iml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/distribution.iml?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/distribution.iml (original)
+++ webservices/axis2/trunk/java/modules/distribution/distribution.iml Tue Jul 31 09:42:49 2007
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4" relativePaths="true" type="JAVA_MODULE">
   <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/classes" />
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
     <exclude-output />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -13,7 +14,7 @@
   </component>
   <component name="copyright">
     <Base>
-      <setting name="state" value="2" />
+      <setting name="state" value="1" />
     </Base>
     <LanguageOptions name="$TEMPLATE$">
       <option name="templateOptions">

Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Tue Jul 31 09:42:49 2007
@@ -257,17 +257,53 @@
 			
 				<!-- generate modules.list -->			        
 				<echo file="target/tmp-repository/modules/modules.list" append="false">
-				soapmonitor-${soapmonitor.mar.version}.mar
-				addressing-${addressing.mar.version}.mar
-				ping-${ping.mar.version}.mar
-				mex-${mex.mar.version}.mar
+#
+# 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.
+#
+soapmonitor-${soapmonitor.mar.version}.mar
+addressing-${addressing.mar.version}.mar
+ping-${ping.mar.version}.mar
+mex-${mex.mar.version}.mar
 scripting-${scripting.mar.version}.mar
 			        </echo>
 
 				<copy file="../../modules/samples/target/toWar/services/version.aar" todir="target/tmp-repository/services"/>
 				<!-- generate services.list -->			        
 			        <echo file="target/tmp-repository/services/services.list" append="false">
-				version.aar
+#
+# 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.
+#
+version.aar
 			        </echo>
                             </tasks>
                         </configuration>
@@ -279,61 +315,4 @@
 	     </plugin>
         </plugins>
     </build>
-
-
-    <!--<profiles>
-        <profile>
-            <id>java15</id>
-            <build>
-                <plugins>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.1</version>
-                        <executions>
-                            <execution>
-                                <id>package</id>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <tasks>
-                                        <copy toDir="target/bin/jdk1.5-modules">
-                                            <fileset
-                                                    file="../../modules/jaxbri/target/axis2-jaxbri-${version}.jar"/>
-                                        </copy>
-                                        <copy toDir="target/bin/jdk1.5-modules">
-                                            <fileset
-                                                    file="../../modules/metadata/target/axis2-metadata-${version}.jar"/>
-                                        </copy>
-                                        <copy toDir="target/bin/jdk1.5-modules">
-                                            <fileset
-                                                    file="../../modules/jaxws/target/axis2-jaxws-${version}.jar"/>
-                                        </copy>
-                                        <copy toDir="target/bin/jdk1.5-modules">
-                                            <fileset
-                                                    file="../../modules/jaxws-api/target/axis2-jaxws-api-${version}.jar"/>
-                                        </copy>
-                                        <copy toDir="target/bin/jdk1.5-modules">
-                                            <fileset
-                                                    file="../../modules/saaj-api/target/axis2-saaj-api-${version}.jar"/>
-                                        </copy>
-                                        <copy toDir="target/bin/jdk1.5-modules">
-                                            <fileset
-                                                    file="../../modules/saaj/target/axis2-saaj-${version}.jar"/>
-                                        </copy>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-        </profile>
-    </profiles>-->
 </project>

Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml Tue Jul 31 09:42:49 2007
@@ -307,6 +307,9 @@
 				<include>yahoojsonsearch/**/*</include>
 				<include>yahoorestsearch/**/*</include>            
             </includes>
+            <excludes>
+                <exclude>**/*.iml</exclude>
+            </excludes>
         </fileSet>
     </fileSets>
     

Propchange: webservices/axis2/trunk/java/modules/documentation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 09:42:49 2007
@@ -0,0 +1,4 @@
+*.iml
+*.iws
+*.ipr
+target

Modified: webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/loggingmodule/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/loggingmodule/META-INF/MANIFEST.MF?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/loggingmodule/META-INF/MANIFEST.MF (original)
+++ webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/loggingmodule/META-INF/MANIFEST.MF Tue Jul 31 09:42:49 2007
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Ant 1.4.1
-

Modified: webservices/axis2/trunk/java/modules/tool/script/java2wsdl.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/java2wsdl.bat?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/java2wsdl.bat (original)
+++ webservices/axis2/trunk/java/modules/tool/script/java2wsdl.bat Tue Jul 31 09:42:49 2007
@@ -1,61 +1,76 @@
-@echo off
-rem ---------------------------------------------------------------------------
-rem Startup script for the WSDLJava
-rem
-rem Environment Variable Prequisites
-rem
-rem   AXIS2_HOME      Must point at your AXIS2 directory 
-rem
-rem   JAVA_HOME       Must point at your Java Development Kit installation.
-rem
-rem   JAVA_OPTS       (Optional) Java runtime options 
-rem ---------------------------------------------------------------------------
-set CURRENT_DIR=%cd%
-
-rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
-goto end
-:gotJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto okJavaHome
-:noJavaHome
-echo The JAVA_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-echo NB: JAVA_HOME should point to a JDK/JRE
-goto end
-:okJavaHome
-
-rem check the AXIS2_HOME environment variable
-if not "%AXIS2_HOME%" == "" goto gotHome
-set AXIS2_HOME=%CURRENT_DIR%
-if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
-
-rem guess the home. Jump one directory up to check if that is the home
-cd ..
-set AXIS2_HOME=%cd%
-cd %CURRENT_DIR%
-
-:gotHome
-if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
-echo The AXIS2_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-
-:okHome
-rem set the classes
-setlocal EnableDelayedExpansion
-rem append the existing classpath to AXIS2_CLASS_PATH
-set AXIS2_CLASS_PATH=%CLASSPATH%;%AXIS2_HOME%
-rem loop through the libs and add them to the class path
-FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
-
-rem ----- Execute The Requested Command ---------------------------------------
-echo Using AXIS2_HOME:   %AXIS2_HOME%
-echo Using JAVA_HOME:    %JAVA_HOME%
-set _RUNJAVA="%JAVA_HOME%\bin\java"
-
-%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.ws.java2wsdl.Java2WSDL %*
-endlocal
-:end
+@echo off
+
+REM  Copyright 2001,2004-2005 The Apache Software Foundation
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the WSDLJava
+rem
+rem Environment Variable Prequisites
+rem
+rem   AXIS2_HOME      Must point at your AXIS2 directory 
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options 
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+rem append the existing classpath to AXIS2_CLASS_PATH
+set AXIS2_CLASS_PATH=%CLASSPATH%;%AXIS2_HOME%
+rem loop through the libs and add them to the class path
+FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME:   %AXIS2_HOME%
+echo Using JAVA_HOME:    %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.ws.java2wsdl.Java2WSDL %*
+endlocal
+:end

Modified: webservices/axis2/trunk/java/modules/tool/script/wsdl2java.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/wsdl2java.bat?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/wsdl2java.bat (original)
+++ webservices/axis2/trunk/java/modules/tool/script/wsdl2java.bat Tue Jul 31 09:42:49 2007
@@ -1,60 +1,75 @@
-@echo off
-rem ---------------------------------------------------------------------------
-rem Startup script for the WSDLJava
-rem
-rem Environment Variable Prequisites
-rem
-rem   AXIS2_HOME      Must point at your AXIS2 directory 
-rem
-rem   JAVA_HOME       Must point at your Java Development Kit installation.
-rem
-rem   JAVA_OPTS       (Optional) Java runtime options 
-rem ---------------------------------------------------------------------------
-set CURRENT_DIR=%cd%
-
-rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
-goto end
-:gotJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto okJavaHome
-:noJavaHome
-echo The JAVA_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-echo NB: JAVA_HOME should point to a JDK/JRE
-goto end
-:okJavaHome
-
-rem check the AXIS2_HOME environment variable
-if not "%AXIS2_HOME%" == "" goto gotHome
-set AXIS2_HOME=%CURRENT_DIR%
-if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
-
-rem guess the home. Jump one directory up to check if that is the home
-cd ..
-set AXIS2_HOME=%cd%
-cd %CURRENT_DIR%
-
-:gotHome
-if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
-echo The AXIS2_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-
-:okHome
-rem set the classes
-setlocal EnableDelayedExpansion
-rem loop through the libs and add them to the class path
-set AXIS2_CLASS_PATH=%AXIS2_HOME%
-FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
-
-rem ----- Execute The Requested Command ---------------------------------------
-echo Using AXIS2_HOME:   %AXIS2_HOME%
-echo Using JAVA_HOME:    %JAVA_HOME%
-set _RUNJAVA="%JAVA_HOME%\bin\java"
-
-%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.axis2.wsdl.WSDL2Java %*
-endlocal
-:end
+@echo off
+
+REM  Copyright 2001,2004-2005 The Apache Software Foundation
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the WSDLJava
+rem
+rem Environment Variable Prequisites
+rem
+rem   AXIS2_HOME      Must point at your AXIS2 directory 
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options 
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\start.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+rem loop through the libs and add them to the class path
+set AXIS2_CLASS_PATH=%AXIS2_HOME%
+FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME:   %AXIS2_HOME%
+echo Using JAVA_HOME:    %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.axis2.wsdl.WSDL2Java %*
+endlocal
+:end

Modified: webservices/axis2/trunk/java/modules/webapp/conf/modules.list
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/conf/modules.list?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/conf/modules.list (original)
+++ webservices/axis2/trunk/java/modules/webapp/conf/modules.list Tue Jul 31 09:42:49 2007
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 addressing-@version@.mar
 soapmonitor-@version@.mar
 ping-@version@.mar

Modified: webservices/axis2/trunk/java/modules/webapp/conf/services.list
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/conf/services.list?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/conf/services.list (original)
+++ webservices/axis2/trunk/java/modules/webapp/conf/services.list Tue Jul 31 09:42:49 2007
@@ -1 +1,19 @@
-version-@version@.aar
+#
+# 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.
+#
+version-@version@.aar

Modified: webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminfooter.inc
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminfooter.inc?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminfooter.inc (original)
+++ webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminfooter.inc Tue Jul 31 09:42:49 2007
@@ -1,3 +1,21 @@
+<!--
+  ~ 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.
+  -->
 </td></tr>
 </table>
 <jsp:include page="footer.inc"></jsp:include>

Modified: webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminheader.inc
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminheader.inc?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminheader.inc (original)
+++ webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/adminheader.inc Tue Jul 31 09:42:49 2007
@@ -1,10 +1,28 @@
-<table width="100%">
-  <tr>
-    <td align="left"><img src="axis2-web/images/asf-logo.gif"/><h1>Axis 2</h1></td>
-    <td align="right"><img src="axis2-web/images/axis.jpg"/></td>
-    </tr>
-    <tr>
-    <td>.</td>
-   <td align="right"><a href="logout" target="_parent" >Log out</a></td>
-   </tr>
-</table>
+<!--
+  ~ 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.
+  -->
+<table width="100%">
+  <tr>
+    <td align="left"><img src="axis2-web/images/asf-logo.gif"/><h1>Axis 2</h1></td>
+    <td align="right"><img src="axis2-web/images/axis.jpg"/></td>
+    </tr>
+    <tr>
+    <td>.</td>
+   <td align="right"><a href="logout" target="_parent" >Log out</a></td>
+   </tr>
+</table>

Modified: webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/footer.inc
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/footer.inc?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/footer.inc (original)
+++ webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/footer.inc Tue Jul 31 09:42:49 2007
@@ -1,19 +1,37 @@
-</td>
-</tr>
-<tr height="20px">
-	<td>
-	<table width="100%">
-		<tr><td>
-			<table width="950px">
-				<tr><td><hr size="1" noshade="" /></td></tr>
-				<tr>
-					<td align="center">Copyright &#169; 1999-2006, The Apache Software Foundation<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</td>
-				</tr>
-			</table>
-		</td>
-		<td>&nbsp;</td>
-		</tr>
-	</table>
-	</td>
-</tr>
-</table>
+<!--
+  ~ 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.
+  -->
+</td>
+</tr>
+<tr height="20px">
+	<td>
+	<table width="100%">
+		<tr><td>
+			<table width="950px">
+				<tr><td><hr size="1" noshade="" /></td></tr>
+				<tr>
+					<td align="center">Copyright &#169; 1999-2006, The Apache Software Foundation<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;</td>
+		</tr>
+	</table>
+	</td>
+</tr>
+</table>

Modified: webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/header.inc
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/header.inc?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/header.inc (original)
+++ webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/header.inc Tue Jul 31 09:42:49 2007
@@ -1,11 +1,29 @@
-<table class="FULL_BLANK"><tr height="100%"><td valign="top">
-<table width="100%">
-<tr><td>
-<table width="950px">
-  <tr>
-    <td align="left"><img src="axis2-web/images/asf-logo.gif"/></td>
-    <td align="right"><img src="axis2-web/images/axis_l.jpg"/></td>
-    </tr>
-</table>
-</td>
-<td>&nbsp;</td></tr></table>
+<!--
+  ~ 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.
+  -->
+<table class="FULL_BLANK"><tr height="100%"><td valign="top">
+<table width="100%">
+<tr><td>
+<table width="950px">
+  <tr>
+    <td align="left"><img src="axis2-web/images/asf-logo.gif"/></td>
+    <td align="right"><img src="axis2-web/images/axis_l.jpg"/></td>
+    </tr>
+</table>
+</td>
+<td>&nbsp;</td></tr></table>

Modified: webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/link-footer.inc
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/link-footer.inc?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/link-footer.inc (original)
+++ webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/link-footer.inc Tue Jul 31 09:42:49 2007
@@ -1,5 +1,23 @@
-<table width="100%">
- <tr>
-   <td align="center"><a href="index.jsp">Back Home</a></td>
-   </tr>
+<!--
+  ~ 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.
+  -->
+<table width="100%">
+ <tr>
+   <td align="center"><a href="index.jsp">Back Home</a></td>
+   </tr>
 </table>

Modified: webservices/axis2/trunk/java/release-docs/readme-files/installation-std-bin.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/release-docs/readme-files/installation-std-bin.txt?view=diff&rev=561387&r1=561386&r2=561387
==============================================================================
--- webservices/axis2/trunk/java/release-docs/readme-files/installation-std-bin.txt (original)
+++ webservices/axis2/trunk/java/release-docs/readme-files/installation-std-bin.txt Tue Jul 31 09:42:49 2007
@@ -1,119 +1,137 @@
-                 
-                 Axis2 Binary Distribution Installation Guide
-                 =====================================================
-
-1. Download and Install the Apache Axis2 Binary Distribution
-
-  Download and install a Java Development Kit (JDK) release (version 1.4 or
-  later) from http://java.sun.com/j2se/. Install the JDK according to the
-  instructions included with the release. Set an environment variable JAVA_HOME 
-  to the pathname of the directory into which you installed the JDK release.
-
-  Download and unpack the Axis2 Binary Distribution into a convenient
-  location so that the distribution resides in its own directory. Set an 
-  environment variables AXIS2_HOME to the pathname of the extracted directory 
-  of Axis2 (Eg: /opt/axis2-1.3).
-
-
-2. Starting up Axis2 Standalone Server
-
-  Standalone Axis2 server can be started by executing the following commands:
-  			$AXIS2_HOME\bin\axis2server.bat (Windows)
-  			$AXIS2_HOME/bin/axis2server.sh (Unix)
-
-  After startup, the default web services included with Axis2 will be available 
-  by visiting http://localhost:8080/axis2/services/
-
-
-3. Building the Axis2 Web Application (axis2.war) Using Standard Binary 
-Distribution
-
-  Download and install Apache Ant (version 1.6.5 or later) from http://
-  ant.apache.org. Install the Apache Ant according to the instructions included 
-  with the Ant release.
-
-  Locate the ant build file (build.xml) inside the webapp directory which 
-  resides in your Axis2 home directory (i.e:- $AXIS_HOME/webapp)". Run the Ant 
-  build by executing "ant create.war" inside the $AXIS2_HOME/webapps folder. 
-  
-  You can find the generated axis2.war inside the $AXIS2_HOME/dist directory. 
-  All the services and modules that are present in the AXIS2_HOME/repository 
-  will be packed in to the created axis2.war together with the Axis2 
-  configuration file found at $AXIS2_HOME/conf/axis2.xml.
-
-  Drop the war in the webapps folder of the servlet container. Most servlet 
-  containers will automatically install war. (some servlet containers may 
-  require a restart in order to capture the new Web application. Refer your 
-  servlet container documentation for more information about this.) Once the 
-  WAR is successfully installed, test it by pointing the Web browser to the 
-  http://<host :port>/axis2. It should produce the the Axis2 Web Application 
-  Home Page.
-  
-  Use the link "Validate" to ensure that everything is fine and smooth. If the 
-  validation fails then the war has failed to install properly or some 
-  essential jars are missing. At such a situation the documentation of the 
-  particular servlet container should be consulted to find the problem. 
-  
-  Read http://ws.apache.org/axis2/1_3/installationguide.html#servlet_container
-  for more information.
-  
-   
-4. Getting Familiar with the Axis2 Convenient Scripts
-
-   It is advised to add the $AXIS2_HOME/bin to the PATH, so that you'll be able 
-   to run the following scripts from any where.
-
-   * axis2.{bat|sh} 	
-   
-   You can use this script to run Web service clients written using Axis2. This 
-   script calls the "java" command after adding the classpath for Axis2 
-   dependent libraries (*.jar files present in your AXIS2_HOME/lib), setting 
-   the Axis2 repository location (AXIS2_HOME/repository) and setting the Axis2 
-   configuration file location(AXIS2_HOME/conf/axis2.xml) for you. With this 
-   you can be relieved from setting all the above Axis2 specific parameters.
-   
-    Usage : axis2.{sh.bat} [-options] class [args...]
-  
-
-   * axis2server.{bat|sh} 
-   
-   This script will start an standalone Axis2 server using the AXIS2_HOME/
-   repository directory as the Axis2 repository and the AXIS2_HOME/conf/
-   axis2.xml as the Axis2 configuration file. This will start all the 
-   transport listeners listed in the AXIS2_HOME/conf/axis2.xml.
-
-   For an example, if you want to deploy a service using standalone Axis2 
-   server,then copy your service archive to the AXIS2_HOME/repository/services 
-   directory. After that go to the "Transport Ins" section of the AXIS2_HOME/
-   conf/axis2.xml and configure the tranport receivers (simpleHttpServer in 
-   port 8080 is listed by default). Then invoke this script.
-   
-   
-   * wsdl2java.{bat|sh} 	
-   
-   This script generates Java code according to a given WSDL file to handle Web 
-   service invocations (Client side Stubs). This script also has the ability to 
-   generate service skeletons according to the given wsdl.
-   
-     Usage: WSDL2Java.{sh|bat} [OPTION]... -uri <Location of WSDL>
-        Eg: WSDL2Java.sh -uri ../wsdl/Axis2Sample.wsdl
-        
-   A more detailed reference about this script can be found http://
-   ws.apache.org/axis2/1_3/reference.html.
-   
-   
-   * java2wsdl.{bat|sh} 	
-   
-   This script generates the appropriate WSDL file for a given java class.
-     Usage: Java2WSDL.{sh|bat} [OPTION]... -cn <fully qualified class name>
-        Eg: Java2WSDL.sh -cn ../samples/test/searchTool.Search
-        
-   A more detailed reference about this script can be found in http://
-   ws.apache.org/axis2/1_3/reference.html
-
-Complete Installation Guide
-===========================
-A complete Installation Guide on Apache Axis2 is available at
-http://ws.apache.org/axis2/1_3/installationguide.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.
+ */
+                 
+                 Axis2 Binary Distribution Installation Guide
+                 =====================================================
+
+1. Download and Install the Apache Axis2 Binary Distribution
+
+  Download and install a Java Development Kit (JDK) release (version 1.4 or
+  later) from http://java.sun.com/j2se/. Install the JDK according to the
+  instructions included with the release. Set an environment variable JAVA_HOME 
+  to the pathname of the directory into which you installed the JDK release.
+
+  Download and unpack the Axis2 Binary Distribution into a convenient
+  location so that the distribution resides in its own directory. Set an 
+  environment variables AXIS2_HOME to the pathname of the extracted directory 
+  of Axis2 (Eg: /opt/axis2-1.3).
+
+
+2. Starting up Axis2 Standalone Server
+
+  Standalone Axis2 server can be started by executing the following commands:
+  			$AXIS2_HOME\bin\axis2server.bat (Windows)
+  			$AXIS2_HOME/bin/axis2server.sh (Unix)
+
+  After startup, the default web services included with Axis2 will be available 
+  by visiting http://localhost:8080/axis2/services/
+
+
+3. Building the Axis2 Web Application (axis2.war) Using Standard Binary 
+Distribution
+
+  Download and install Apache Ant (version 1.6.5 or later) from http://
+  ant.apache.org. Install the Apache Ant according to the instructions included 
+  with the Ant release.
+
+  Locate the ant build file (build.xml) inside the webapp directory which 
+  resides in your Axis2 home directory (i.e:- $AXIS_HOME/webapp)". Run the Ant 
+  build by executing "ant create.war" inside the $AXIS2_HOME/webapps folder. 
+  
+  You can find the generated axis2.war inside the $AXIS2_HOME/dist directory. 
+  All the services and modules that are present in the AXIS2_HOME/repository 
+  will be packed in to the created axis2.war together with the Axis2 
+  configuration file found at $AXIS2_HOME/conf/axis2.xml.
+
+  Drop the war in the webapps folder of the servlet container. Most servlet 
+  containers will automatically install war. (some servlet containers may 
+  require a restart in order to capture the new Web application. Refer your 
+  servlet container documentation for more information about this.) Once the 
+  WAR is successfully installed, test it by pointing the Web browser to the 
+  http://<host :port>/axis2. It should produce the the Axis2 Web Application 
+  Home Page.
+  
+  Use the link "Validate" to ensure that everything is fine and smooth. If the 
+  validation fails then the war has failed to install properly or some 
+  essential jars are missing. At such a situation the documentation of the 
+  particular servlet container should be consulted to find the problem. 
+  
+  Read http://ws.apache.org/axis2/1_3/installationguide.html#servlet_container
+  for more information.
+  
+   
+4. Getting Familiar with the Axis2 Convenient Scripts
+
+   It is advised to add the $AXIS2_HOME/bin to the PATH, so that you'll be able 
+   to run the following scripts from any where.
+
+   * axis2.{bat|sh} 	
+   
+   You can use this script to run Web service clients written using Axis2. This 
+   script calls the "java" command after adding the classpath for Axis2 
+   dependent libraries (*.jar files present in your AXIS2_HOME/lib), setting 
+   the Axis2 repository location (AXIS2_HOME/repository) and setting the Axis2 
+   configuration file location(AXIS2_HOME/conf/axis2.xml) for you. With this 
+   you can be relieved from setting all the above Axis2 specific parameters.
+   
+    Usage : axis2.{sh.bat} [-options] class [args...]
+  
+
+   * axis2server.{bat|sh} 
+   
+   This script will start an standalone Axis2 server using the AXIS2_HOME/
+   repository directory as the Axis2 repository and the AXIS2_HOME/conf/
+   axis2.xml as the Axis2 configuration file. This will start all the 
+   transport listeners listed in the AXIS2_HOME/conf/axis2.xml.
+
+   For an example, if you want to deploy a service using standalone Axis2 
+   server,then copy your service archive to the AXIS2_HOME/repository/services 
+   directory. After that go to the "Transport Ins" section of the AXIS2_HOME/
+   conf/axis2.xml and configure the tranport receivers (simpleHttpServer in 
+   port 8080 is listed by default). Then invoke this script.
+   
+   
+   * wsdl2java.{bat|sh} 	
+   
+   This script generates Java code according to a given WSDL file to handle Web 
+   service invocations (Client side Stubs). This script also has the ability to 
+   generate service skeletons according to the given wsdl.
+   
+     Usage: WSDL2Java.{sh|bat} [OPTION]... -uri <Location of WSDL>
+        Eg: WSDL2Java.sh -uri ../wsdl/Axis2Sample.wsdl
+        
+   A more detailed reference about this script can be found http://
+   ws.apache.org/axis2/1_3/reference.html.
+   
+   
+   * java2wsdl.{bat|sh} 	
+   
+   This script generates the appropriate WSDL file for a given java class.
+     Usage: Java2WSDL.{sh|bat} [OPTION]... -cn <fully qualified class name>
+        Eg: Java2WSDL.sh -cn ../samples/test/searchTool.Search
+        
+   A more detailed reference about this script can be found in http://
+   ws.apache.org/axis2/1_3/reference.html
+
+Complete Installation Guide
+===========================
+A complete Installation Guide on Apache Axis2 is available at
+http://ws.apache.org/axis2/1_3/installationguide.html
+   
+   



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org