Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
renamed Java packages to remove com.phonegap prefix
  • Loading branch information
pmuellr committed Feb 16, 2011
1 parent 4af1211 commit 0c2b0f5978cbbaa41c6aee2a9641862ab4610969
Show file tree
Hide file tree
Showing 63 changed files with 131 additions and 120 deletions.
@@ -17,7 +17,7 @@
<key>CFBundleIconFile</key>
<string>weinre.icns</string>
<key>CFBundleIdentifier</key>
<string>com.phonegap.weinre.application</string>
<string>weinre.application</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -12,4 +12,4 @@ BASEDIR=`dirname $0`
java \
-XstartOnFirstThread \
-classpath $BASEDIR/weinre-ui.jar:$BASEDIR/weinre.jar:$BASEDIR/swt.jar \
com.phonegap.weinre.application.GUIMain
weinre.application.GUIMain
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.application;
package weinre.application;

import java.io.IOException;

@@ -29,8 +29,9 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

import com.phonegap.weinre.server.Main;
import com.phonegap.weinre.server.ServerSettings;
import weinre.server.Main;
import weinre.server.ServerSettings;


/**
*
@@ -245,7 +246,7 @@ public void run() {
public String getBrowserURL() {
String result;

ServerSettings settings = com.phonegap.weinre.server.Main.getSettings();
ServerSettings settings = weinre.server.Main.getSettings();

String host = settings.getNiceHostName();
int port = settings.getHttpPort();
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.application;
package weinre.application;

import java.io.File;
import java.io.FileReader;
@@ -17,7 +17,8 @@
import org.apache.wink.json4j.JSONObject;
import org.eclipse.swt.widgets.Shell;

import com.phonegap.weinre.server.Main;
import weinre.server.Main;


/**
*
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.application;
package weinre.application;

import org.apache.wink.json4j.JSONException;
import org.apache.wink.json4j.JSONObject;
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/weinre.application/src/com/phonegap/weinre/application/GUIMain.java"/>
<listEntry value="/weinre.application/src/weinre/application/GUIMain.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -10,7 +10,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.phonegap.weinre.application.GUIMain"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="weinre.application.GUIMain"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="weinre.application"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread"/>
</launchConfiguration>
@@ -355,7 +355,7 @@
<jar destfile="${OUT}/weinre.jar">
<manifest>
<attribute name="Built-By" value="${ant.file.basename} - ${ant.project.name}"/>
<attribute name="Main-Class" value="com.phonegap.weinre.server.Main"/>
<attribute name="Main-Class" value="weinre.server.Main"/>
</manifest>

<fileset file="${OUT}/build-info.txt"/>
@@ -399,7 +399,7 @@
<jar destfile="${OUT}/weinre-ui.jar">
<manifest>
<attribute name="Built-By" value="${ant.file.basename} - ${ant.project.name}"/>
<attribute name="Main-Class" value="com.phonegap.weinre.application.GUIMain"/>
<attribute name="Main-Class" value="weinre.application.GUIMain"/>
</manifest>

<fileset file="${OUT}/build-info.txt"/>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.phonegap.weinre.server.android"
package="weinre.server.android"
android:versionCode="1"
android:versionName="1.0">
<application android:icon="@drawable/icon" android:label="@string/app_name">
@@ -1,9 +1,10 @@
package com.phonegap.weinre.server.android;
package weinre.server.android;

import android.app.Activity;
import android.os.Bundle;

import com.phonegap.weinre.server.Main;
import weinre.server.Main;
import weinre.server.android.R;

//-----------------------------------------------------------------------------
public class MainActivity extends Activity {
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.io.IOException;
import java.util.List;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.io.IOException;
import java.util.ArrayList;
@@ -147,7 +147,7 @@ private Object getService_(String name) throws ClassNotFoundException, Instantia
Object result = serviceMap.get(name);
if (null != result) return result;

String klassName = "com.phonegap.weinre.server.service." + name;
String klassName = "weinre.server.service." + name;
Class klass = Class.forName(klassName);
if (null == klass) throw new ClassNotFoundException("class not found: " + klassName);

@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.util.ArrayList;
import java.util.HashMap;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

/**
*
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import org.apache.wink.json4j.JSONArray;
import org.apache.wink.json4j.JSONException;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.util.ArrayList;
import java.util.Collections;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.util.ArrayList;
import java.util.List;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.io.IOException;
import java.io.OutputStream;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.io.PrintStream;

@@ -14,7 +14,8 @@
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.log.StdErrLog;

import com.phonegap.weinre.server.http.HttpServer;
import weinre.server.http.HttpServer;



/**
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.util.LinkedList;
import java.util.List;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

/**
*
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.net.InetAddress;
import java.net.NetworkInterface;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.util.ArrayList;
import java.util.LinkedList;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.io.File;
import java.io.FileReader;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server;
package weinre.server;

import java.util.List;

@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server.http;
package weinre.server.http;

import java.io.IOException;
import java.net.MalformedURLException;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server.http;
package weinre.server.http;

import java.io.IOException;
import java.io.PrintStream;
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server.http;
package weinre.server.http;

import java.io.IOException;

@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server.http;
package weinre.server.http;

import java.io.IOException;

@@ -18,8 +18,9 @@
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.util.component.LifeCycle;

import com.phonegap.weinre.server.Main;
import com.phonegap.weinre.server.ServerSettings;
import weinre.server.Main;
import weinre.server.ServerSettings;


public class HttpServer {

@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server.http;
package weinre.server.http;

import java.io.IOException;
import java.io.InputStream;
@@ -23,10 +23,11 @@
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;

import com.phonegap.weinre.server.Channel;
import com.phonegap.weinre.server.ChannelManager;
import com.phonegap.weinre.server.Main;
import com.phonegap.weinre.server.Utility;
import weinre.server.Channel;
import weinre.server.ChannelManager;
import weinre.server.Main;
import weinre.server.Utility;


/**
*
@@ -5,7 +5,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/

package com.phonegap.weinre.server.http;
package weinre.server.http;

import java.io.IOException;

@@ -19,8 +19,9 @@
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlets.ProxyServlet;

import com.phonegap.weinre.server.Main;
import com.phonegap.weinre.server.ServerSettings;
import weinre.server.Main;
import weinre.server.ServerSettings;


public class ProxyServer {
private ServerSettings settings;

0 comments on commit 0c2b0f5

Please sign in to comment.