You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/07/11 23:53:52 UTC

[juneau] branch master updated: Fix launchers.

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new af592b3  Fix launchers.
af592b3 is described below

commit af592b3a845e144d19657462c7f718799dd085da
Author: JamesBognar <ja...@apache.org>
AuthorDate: Thu Jul 11 19:53:39 2019 -0400

    Fix launchers.
---
 ...rrorHandling.html => 32.LoggingAndDebugging.html} |  0
 launches/Package Juneau.launch                       |  2 +-
 launches/juneau-build-all.launch                     |  6 +++---
 launches/juneau-build-javadoc.launch                 |  6 +++---
 launches/juneau-build.launch                         | 20 +++-----------------
 launches/juneau-create-workspace.launch              |  4 ++--
 launches/juneau-open-javadoc.launch                  |  6 +++---
 7 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/32.LoggingAndErrorHandling.html b/juneau-doc/docs/Topics/07.juneau-rest-server/32.LoggingAndDebugging.html
similarity index 100%
rename from juneau-doc/docs/Topics/07.juneau-rest-server/32.LoggingAndErrorHandling.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/32.LoggingAndDebugging.html
diff --git a/launches/Package Juneau.launch b/launches/Package Juneau.launch
index 214729c..c57fbfc 100644
--- a/launches/Package Juneau.launch	
+++ b/launches/Package Juneau.launch	
@@ -29,5 +29,5 @@
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/juneau-core/target&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/juneau-rest-client/target&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/juneau-distrib/target&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/juneau-microservice/target&quot; type=&quot;2&quot;/&gt;&#10;& [...]
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/root}"/>
 </launchConfiguration>
diff --git a/launches/juneau-build-all.launch b/launches/juneau-build-all.launch
index e2071bc..c09b4f6 100644
--- a/launches/juneau-build-all.launch
+++ b/launches/juneau-build-all.launch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="/juneau-root/ju"/>
+<stringAttribute key="bad_container_name" value="/juneau/ju"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-build-all.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau/launches/juneau-build-all.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau}"/>
 </launchConfiguration>
diff --git a/launches/juneau-build-javadoc.launch b/launches/juneau-build-javadoc.launch
index f838d73..d7839b7 100644
--- a/launches/juneau-build-javadoc.launch
+++ b/launches/juneau-build-javadoc.launch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="/juneau-root/ju"/>
+<stringAttribute key="bad_container_name" value="/juneau/ju"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-build-javadoc.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau/launches/juneau-build-javadoc.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau}"/>
 </launchConfiguration>
diff --git a/launches/juneau-build.launch b/launches/juneau-build.launch
index dfb2b1e..ada39c6 100644
--- a/launches/juneau-build.launch
+++ b/launches/juneau-build.launch
@@ -1,23 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- ***************************************************************************************************************************
- * 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.                                              *
- ***************************************************************************************************************************
--->
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="/juneau-root/ju"/>
+<stringAttribute key="bad_container_name" value="/juneau/ju"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-build.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau/launches/juneau-build.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau}"/>
 </launchConfiguration>
diff --git a/launches/juneau-create-workspace.launch b/launches/juneau-create-workspace.launch
index b347f20..8cabc5a 100644
--- a/launches/juneau-create-workspace.launch
+++ b/launches/juneau-create-workspace.launch
@@ -3,6 +3,6 @@
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-create-workspace.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau/launches/juneau-create-workspace.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau}"/>
 </launchConfiguration>
diff --git a/launches/juneau-open-javadoc.launch b/launches/juneau-open-javadoc.launch
index 95b5523..39a5360 100644
--- a/launches/juneau-open-javadoc.launch
+++ b/launches/juneau-open-javadoc.launch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="/juneau-root/ju"/>
+<stringAttribute key="bad_container_name" value="/juneau/ju"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-open-javadoc.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau/launches/juneau-open-javadoc.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau}"/>
 </launchConfiguration>