[java-identity-provider COMMIT] in /trunk: idp-core/src/main/java/net/shibboleth/idp/cli/AbstractCommandLineArguments...

[noreply at shibboleth.net]

Author: scantor
Date: Wed May  6 12:42:31 2015
New Revision: 7500

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7500&view=rev
Log:
IDP-704 - Float the /idp context path over into the default base URL so it can be overridden

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractCommandLineArguments.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadMetadataArguments.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadServiceArguments.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ResolverTestArguments.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/StatusArguments.java
    trunk/idp-distribution/src/main/resources/bin/runclass.bat
    trunk/idp-distribution/src/main/resources/bin/runclass.sh

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractCommandLineArguments.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractCommandLineArguments.java?rev=7500&r1=7499&r2=7500&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractCommandLineArguments.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractCommandLineArguments.java	Wed May  6 12:42:31 2015
@@ -42,12 +42,12 @@
     @Parameter(names = {"-h", "--help"}, description = "Display program usage", help = true)
     private boolean help;
 
-    /** URL to invoke. */
-    @Parameter(names = {"-u", "--url"}, description = "Base URL to invoke (no path, no query string)")
+    /** Base of URL to invoke. */
+    @Parameter(names = {"-u", "--url"}, description = "Base URL to invoke (path and query string will be appended)")
     @Nonnull private String url;
 
-    /** Path to invoke. */
-    @Parameter(names = {"-p", "--path"}, description = "Path to append to URL to invoke (may include query string)")
+    /** Path to add to base URL. */
+    @Parameter(names = {"-p", "--path"}, description = "Path to append to base URL to invoke")
     @Nullable private String path;
     
     /** Trust store for SSL connectivity. */
@@ -66,7 +66,7 @@
     public AbstractCommandLineArguments() {
         url = System.getProperty(BASEURL_PROPERTY);
         if (url == null) {
-            url = "http://localhost";
+            url = "http://localhost/idp";
         }
     }
     

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadMetadataArguments.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadMetadataArguments.java?rev=7500&r1=7499&r2=7500&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadMetadataArguments.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadMetadataArguments.java	Wed May  6 12:42:31 2015
@@ -37,7 +37,7 @@
     protected StringBuilder doBuildURL(@Nonnull final StringBuilder builder) {
         
         if (getPath() == null) {
-            builder.append("/idp/profile/admin/reload-metadata");
+            builder.append("/profile/admin/reload-metadata");
         }
         
         if (builder.toString().contains("?")) {

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadServiceArguments.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadServiceArguments.java?rev=7500&r1=7499&r2=7500&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadServiceArguments.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadServiceArguments.java	Wed May  6 12:42:31 2015
@@ -37,7 +37,7 @@
     protected StringBuilder doBuildURL(@Nonnull final StringBuilder builder) {
         
         if (getPath() == null) {
-            builder.append("/idp/profile/admin/reload-service");
+            builder.append("/profile/admin/reload-service");
         }
         
         if (builder.toString().contains("?")) {

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ResolverTestArguments.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ResolverTestArguments.java?rev=7500&r1=7499&r2=7500&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ResolverTestArguments.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ResolverTestArguments.java	Wed May  6 12:42:31 2015
@@ -96,7 +96,7 @@
     protected StringBuilder doBuildURL(@Nonnull final StringBuilder builder) {
         
         if (getPath() == null) {
-            builder.append("/idp/profile/admin/resolvertest");
+            builder.append("/profile/admin/resolvertest");
         }
         
         if (builder.toString().contains("?")) {


[... 45 lines stripped ...]