Skip to content

Commit 9df1ee1

Browse files
author
Drew Guarnera
committed
Merge branch 'development'
2 parents b6cf668 + 3120142 commit 9df1ee1

28 files changed

+1493
-1616
lines changed

.classpath

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry exported="true" kind="lib" path="lib/TETJavaClient.jar"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
54
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6-
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=iTrace&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;acceptedTypes=jar%2Cbundle%2Cejb%2Cmaven-plugin&amp;alphaOrder=false&amp;resolveInWorkspace=false&amp;transitiveResolve=true&amp;readOSGiMetadata=false&amp;retrievedClasspath=true&amp;retrievedClasspathPattern=lib%2F%5Bartifact%5D-%5Brevision%5D.%5Bext%5D&amp;retrievedClasspathSync=false&amp;retrievedClasspathTypes=jar"/>
75
<classpathentry kind="src" path="src"/>
6+
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
7+
<classpathentry exported="true" kind="lib" path="lib/functionaljava-4.1.jar"/>
8+
<classpathentry exported="true" kind="lib" path="lib/gson-2.2.4.jar"/>
9+
<classpathentry exported="true" kind="lib" path="lib/TETJavaClient.jar"/>
810
<classpathentry kind="output" path="bin"/>
911
</classpath>

LICENSE.md

Lines changed: 620 additions & 285 deletions
Large diffs are not rendered by default.

META-INF/MANIFEST.MF

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Itrace
4-
Bundle-SymbolicName: edu.ysu.itrace;singleton:=true
5-
Bundle-Version: 1.0.0.0
6-
Bundle-Activator: edu.ysu.itrace.ITrace
4+
Bundle-SymbolicName: org.itrace;singleton:=true
5+
Bundle-Version: 0.1.0
6+
Bundle-Activator: org.itrace.ITrace
77
Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.runtime,
99
org.eclipse.ui.ide;bundle-version="3.7.0",
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
1515
ch.qos.logback.classic;bundle-version="1.0.7",
1616
org.eclipse.e4.core.services;bundle-version="2.0.0"
1717
Bundle-ActivationPolicy: lazy
18-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
18+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1919
Bundle-ClassPath: .,
2020
lib/slf4j-api-1.7.5.jar,
2121
lib/functionaljava-4.1.jar,

plugin.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
<extension
55
point="org.eclipse.ui.perspectives">
66
<perspective
7-
class="edu.ysu.itrace.PerspectiveFactory"
8-
id="edu.ysu.itrace.perspectivefactory"
9-
name="itrace">
7+
class="org.itrace.PerspectiveFactory"
8+
id="org.itrace.perspectivefactory"
9+
name="iTrace Eclipse Plugin">
1010
</perspective>
1111
</extension>
1212
<extension
1313
point="org.eclipse.ui.perspectiveExtensions">
1414
<perspectiveExtension
15-
targetID="edu.ysu.itrace.perspectivefactory">
15+
targetID="org.itrace.perspectivefactory">
1616
<actionSet id="org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
1717
</perspectiveExtension>
1818
</extension>
1919
<extension
2020
point="org.eclipse.ui.views">
2121
<view
22-
class="edu.ysu.itrace.ControlView"
23-
id="edu.ysu.itrace.controlview"
24-
name="itrace controller"
22+
class="org.itrace.ControlView"
23+
id="org.itrace.controlview"
24+
name="iTrace Eclipse Plugin"
2525
restorable="true">
2626
</view>
2727
</extension>
@@ -39,15 +39,15 @@
3939
<extension
4040
point="org.eclipse.core.runtime.preferences">
4141
<initializer
42-
class="edu.ysu.itrace.preferences.PreferenceInitializer">
42+
class="org.itrace.preferences.ITracePreferenceInitializer">
4343
</initializer>
4444
</extension>
4545
<extension
4646
point="org.eclipse.ui.preferencePages">
4747
<page
48-
class="edu.ysu.itrace.preferences.PluginPreferences"
49-
id="edu.ysu.itrace.preferences.PluginPreferences"
50-
name="iTrace">
48+
class="org.itrace.preferences.ITracePreferencePage"
49+
id="org.itrace.preferences.ITracePreferencePage"
50+
name="iTrace Eclipse Plugin">
5151
</page>
5252
</extension>
5353

src/edu/ysu/itrace/ConnectionManager.java

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)