[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/bin: aacli.bat ant-jetty.xml ant.bat bu...

noreply at shibboleth.net noreply at shibboleth.net
Wed Dec 31 08:10:58 EST 2014


Author: rdw
Date: Wed Dec 31 08:10:58 2014
New Revision: 7221

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7221&view=rev
Log:
native line endings

Modified:
    trunk/idp-distribution/src/main/resources/bin/aacli.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/ant.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/build.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/build.xml   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/install.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/keygen.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/reload-metadata.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/reload-service.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/runclass.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/seckeygen.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/seckeygen.sh   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/status.bat   (contents, props changed)
    trunk/idp-distribution/src/main/resources/bin/version.bat   (contents, props changed)

Modified: trunk/idp-distribution/src/main/resources/bin/aacli.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/aacli.bat?rev=7221&r1=7220&r2=7221&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/aacli.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/aacli.bat Wed Dec 31 08:10:58 2014
@@ -1,4 +1,4 @@
- at echo off
-setlocal
-
-"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ResolverTestArguments net.shibboleth.idp.cli.CLI %*
+ at echo off
+setlocal
+
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.cli.ResolverTestArguments net.shibboleth.idp.cli.CLI %*

Modified: trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml?rev=7221&r1=7220&r2=7221&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml Wed Dec 31 08:10:58 2014
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Shibboleth IdP V3 - Jetty Container" basedir=".." default="install">
-	
-	<!--  This file is for automatic configuration of Jetty, primarily from THE MSI installer.
-	
-	   Names and APIS *may* change in thre future, please enter an RFI if you wish to use this
-	   in production outside the MSI installer.
-	
-	
-	TARGETS:
-
-	        The following top level target is.  This in turn calls subsidiary targets.
-
-	        install:         
-	        
-	        PROPERTIES:
-	        The following properties are used.  They have to be provided on the command line or
-	        via the property file.
-	        
-	        jetty.property.file: Name of a file to fill in all or some of the below. This file is deleted after processing.
-            jetty.merge.properties: The name of a property file to merge with idp.ini.  This file is deleted after processing.
-            idp.host.name: The host name.
-            idp.uri.subject.alt.name: If we are creating certificates.
-            idp.target.dir: where to install to. 
-            idp.keystore.password: password to use on the created keystore (this value must also have been written to the merge properties file
-	        jetty.no.tidy: Do not delete the two above files (debug only)
-	        
-	    -->
-
-	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
-
-	<target name="install" depends="init, properties, keystores, directories, copyinis, reprotect, tidy" />
-
-	<target name="init">
-		<tstamp />
-		<hostinfo />
-	</target>
-
-	<target name="properties">
-		<property file="${jetty.property.file}" />
-		<available property="idp.ini.present" file="${idp.target.dir}/jetty-base/start.d/idp.ini" />
-		<available property="idp.jks.present" file="${idp.target.dir}/credentials/idp.jks" />
-		<available property="idp.userfacing.p12.present" file="${idp.target.dir}/credentials/idp-userfacing.p12" />
-		<condition property="generate.userfacing.p12">
-			<!-- Generate the pkcs12 keystore if neither the JKS nor the P12 exist -->
-			<not>
-				<or>
-					<istrue value="${idp.jks.present}" />
-					<istrue value="${idp.userfacing.p12.present}" />
-				</or>
-			</not>
-		</condition>
-	</target>
-
-	<!-- Handle keystores -->
-	<target name="keystores" depends="jks, gen-userfacing" />
-

[... 1861 lines stripped ...]


More information about the commits mailing list