dev/null |binary xmlsecurity/test_docs/tools/README.txt | 5 - xmlsecurity/test_docs/tools/httpserv/build.xml | 5 + xmlsecurity/test_docs/tools/httpserv/dist/README.TXT | 33 ---------- xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties | 2 5 files changed, 9 insertions(+), 36 deletions(-)
New commits: commit 1e8482db2d8b0b19fac88673384c227047a862b1 Author: Andre Fischer <[email protected]> Date: Tue Aug 21 11:27:12 2012 +0000 Resolves: #i120635# Removed httpserv.jar and changed its dist directory (cherry picked from commit efc6346ef6a3a9b618979230036d877149ce0d7d) Change-Id: I983b106ef46bd9b95f6ef12d3c2432d604dd08a8 diff --git a/xmlsecurity/test_docs/tools/README.txt b/xmlsecurity/test_docs/tools/README.txt index dd1431b..159d2c0 100644 --- a/xmlsecurity/test_docs/tools/README.txt +++ b/xmlsecurity/test_docs/tools/README.txt @@ -11,8 +11,9 @@ java -jar httpserv/dist/httpserv.jar --accept portnumber portnumber: an arbitrary port number to which the server should listen. httpserv looks for the requested file relativ to the current directory. For -example, you are in a directory which contains the index.html. From there -you run httpserv.jar: +example, you are in +$(SRC_ROOT)/xmlsecurity/$(INPATH)/httpserv/dist/javadoc, +a directory which contains the index.html. From there you run httpserv.jar: java -jar <path_to_wherever_it_is>/httpserv.jar --accept 8000 diff --git a/xmlsecurity/test_docs/tools/httpserv/build.xml b/xmlsecurity/test_docs/tools/httpserv/build.xml index 831e963..aacabc8 100644 --- a/xmlsecurity/test_docs/tools/httpserv/build.xml +++ b/xmlsecurity/test_docs/tools/httpserv/build.xml @@ -71,4 +71,9 @@ nbproject/build-impl.xml file. --> + <!-- Import the environment as properties to make them available in project.properties + --> + <target name="-pre-init"> + <property environment="env" /> + </target> </project> diff --git a/xmlsecurity/test_docs/tools/httpserv/dist/README.TXT b/xmlsecurity/test_docs/tools/httpserv/dist/README.TXT deleted file mode 100755 index 28db189..0000000 --- a/xmlsecurity/test_docs/tools/httpserv/dist/README.TXT +++ /dev/null @@ -1,33 +0,0 @@ -======================== -BUILD OUTPUT DESCRIPTION -======================== - -When you build an Java application project that has a main class, the IDE -automatically copies all of the JAR -files on the projects classpath to your projects dist/lib folder. The IDE -also adds each of the JAR files to the Class-Path element in the application -JAR files manifest file (MANIFEST.MF). - -To run the project from the command line, go to the dist folder and -type the following: - -java -jar "httpserv.jar" - -To distribute this project, zip up the dist folder (including the lib folder) -and distribute the ZIP file. - -Notes: - -* If two JAR files on the project classpath have the same name, only the first -JAR file is copied to the lib folder. -* Only JAR files are copied to the lib folder. -If the classpath contains other types of files or folders, none of the -classpath elements are copied to the lib folder. In such a case, -you need to copy the classpath elements to the lib folder manually after the build. -* If a library on the projects classpath also has a Class-Path element -specified in the manifest,the content of the Class-Path element has to be on -the projects runtime path. -* To set a main class in a standard Java project, right-click the project node -in the Projects window and choose Properties. Then click Run and enter the -class name in the Main Class field. Alternatively, you can manually type the -class name in the manifest Main-Class element. diff --git a/xmlsecurity/test_docs/tools/httpserv/dist/httpserv.jar b/xmlsecurity/test_docs/tools/httpserv/dist/httpserv.jar deleted file mode 100755 index b80b609..0000000 Binary files a/xmlsecurity/test_docs/tools/httpserv/dist/httpserv.jar and /dev/null differ diff --git a/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties b/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties index 049b553..a0ec60a 100644 --- a/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties +++ b/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties @@ -18,7 +18,7 @@ debug.classpath=\ debug.test.classpath=\ ${run.test.classpath} # This directory is removed when the project is cleaned: -dist.dir=dist +dist.dir=../../../${env.INPATH}/misc/httpserv dist.jar=${dist.dir}/httpserv.jar dist.javadoc.dir=${dist.dir}/javadoc excludes= _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
