You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2015/01/07 19:01:53 UTC
[1/2] incubator-usergrid git commit: Point Launcher to a copy of
Portal deployed to our project website.
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 24bb76886 -> 4d24a98b1
Point Launcher to a copy of Portal deployed to our project website.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ea2ad040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ea2ad040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ea2ad040
Branch: refs/heads/master
Commit: ea2ad040743dccef1992007e39c946f86b8e23c6
Parents: 2841db6
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jan 7 11:48:40 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jan 7 11:48:40 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/usergrid/launcher/App.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ea2ad040/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java b/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
index fe20519..cee20d5 100644
--- a/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
+++ b/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
@@ -42,9 +42,12 @@ public class App {
private static final Logger logger = LoggerFactory.getLogger( App.class );
- private static final String GH_PORTAL_URL = "http://apigee.github.io/usergrid-portal/";
+ // TODO: host portal on Apache infrastructure, or build portal into launcher
+ private static final String GH_PORTAL_URL =
+ "http://usergrid.incubator.apache.org/v101-portal-demo";
- public static boolean MAC_OS_X = ( System.getProperty( "os.name" ).toLowerCase().startsWith( "mac os x" ) );
+ public static boolean MAC_OS_X =
+ ( System.getProperty( "os.name" ).toLowerCase().startsWith( "mac os x" ) );
LogViewerFrame logViewer = null;
LauncherFrame launcher = null;
[2/2] incubator-usergrid git commit: Merge remote-tracking branch
'snoopdave/Usergrid-315' into apache_usergrid/master
Posted by ro...@apache.org.
Merge remote-tracking branch 'snoopdave/Usergrid-315' into apache_usergrid/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4d24a98b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4d24a98b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4d24a98b
Branch: refs/heads/master
Commit: 4d24a98b1b8a8f56344f3848c50071625e1ecb17
Parents: 24bb768 ea2ad04
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Jan 7 11:01:46 2015 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Jan 7 11:01:46 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/usergrid/launcher/App.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------