Skip to content

Commit 75df40f

Browse files
author
Gyorgy Orban
authored
Merge pull request #145 from Vodorok/project_restructorization
Project restructorization
2 parents db20b8e + a204eae commit 75df40f

File tree

161 files changed

+1732
-1449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+1732
-1449
lines changed

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,18 @@
44
*.swp
55
*.swo
66

7-
# eclipse
8-
.project
9-
.settings
10-
11-
# idea
7+
# Eclipse
128
.idea
139
*.iml
10+
target/
11+
logs/
1412

1513
# Package Files #
1614
*.jar
1715
*.war
1816
*.ear
1917

2018
# maven
21-
target/
2219
pom.xml.tag
2320
pom.xml.releaseBackup
2421
pom.xml.versionsBackup

.mvn/extensions.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<extensions>
2+
<extension>
3+
<groupId>org.eclipse.tycho.extras</groupId>
4+
<artifactId>tycho-pomless</artifactId>
5+
<version>1.3.0</version>
6+
</extension>
7+
</extensions>

.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.codechecker.eclipse</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

.travis.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
sudo: required
21
dist: trusty
2+
install: true
33
language: java
44
jdk:
5-
- oraclejdk8
6-
addons:
7-
apt:
8-
package: maven tar
5+
- oraclejdk8
6+
7+
env: DISPLAY=:99.0
8+
9+
before_install:
10+
- sudo apt-get install at-spi2-core
11+
912
before_script:
10-
- cd ../CodeCheckerEclipsePlugin/eclipse-plugin/
11-
script: mvn package
12-
deploy:
13-
provider: releases
14-
api_key:
15-
secure: PKQXSde1+GfeTJBQlYGCXFoXGy9LpMbD0oagpQtHk6d9NtZ9T9stx0gC3BODE9rGPCtKyQjOnOQ2V0GIMQMt0Qx22zSvGN4bwAYn0BHHXV56HLyZV2U8eW3a5eLt+yB7OhkARg7nflo9Yh1HDmxFtovsAz1TJ0Ri1UGmMMj03wNdc8CHJy6vuN3YljxBtZFLAH7sYkL5QC0jjFkF9/7bd9lF6nyLqBU5VqQcbGO3gRFnE46+KHkw0tC3F3H7HcYJJydRWAoTwD88UEzrJnCNGnYarwFRwix5/O2Wgjk5CbEie9IxtjeiBiiVbAS+/OxKEKw+4E2TV9ThyX4BwapcalBKoQqYAXDnZwD9EAT3+N+vKRHk/OI3IsD4lM8h2E5HrVEURY/wMvXH9dYrSnYGPmrAks1Ef3X1iMxCxqiR7k+vvKRAG2XXn92Dq9A3fMEZYQvh6YtBp7nC022Cpr11HyriC/C8WD4arfDekI7ICAZfWnaAwdUvr4u991DIRmApUC905lcP5NB/mGfc0rMeSwK2fpGcWqDkxYo7bDDoQHkImiLC3NRCY80NSO3tpcH3AlHRtF/WIy2Ln626PMIt98nDAiWZf+35GW0HoCyjo3SYbRtQMdQD85ZhbqVva+rtzN1j4AuoP/pCbChsICs0ebAdOavjOb/8cwFxBMuOPYA=
16-
file: "/home/travis/build/Ericsson/CodeCheckerEclipsePlugin/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/target/cc.codechecker.eclipse.plugin*.jar"
17-
skip_cleanup: true
18-
on:
19-
repo: Ericsson/CodeCheckerEclipsePlugin
20-
tags: true
13+
- sh -e /etc/init.d/xvfb start
14+
- sleep 10 # give xvfb some time to start
15+
16+
script: mvn -f mavendeps/pom.xml p2:site && mvn clean verify
17+
18+
after_failure:
19+
- cat $TRAVIS_BUILD_DIR/tests/org.codechecker.eclipse.rcp.it.tests/target/work/data/.metadata/.log
20+
- cat $TRAVIS_BUILD_DIR/tests/org.codechecker.eclipse.rcp.it.tests/target/surefire-reports/*
21+
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4+
<fileset name="all" enabled="true" check-config-name="CodeCheckerCheckstyle" local="false">
5+
<file-match-pattern match-pattern="." include-pattern="true"/>
6+
</fileset>
7+
</fileset-config>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
4+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5+
<classpathentry kind="src" path="src/"/>
6+
<classpathentry kind="output" path="target/classes"/>
7+
</classpath>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.codechecker.eclipse.plugin</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
31+
<nature>org.eclipse.pde.PluginNature</nature>
32+
<nature>org.eclipse.jdt.core.javanature</nature>
33+
</natures>
34+
</projectDescription>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
5+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6+
org.eclipse.jdt.core.compiler.compliance=1.8
7+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12+
org.eclipse.jdt.core.compiler.source=1.8
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: org.codechecker.eclipse
4+
Bundle-SymbolicName: org.codechecker.eclipse.plugin;singleton:=true
5+
Bundle-Version: 0.0.6.qualifier
6+
Require-Bundle: org.eclipse.ui,
7+
org.eclipse.ui.ide,
8+
org.eclipse.core.runtime,
9+
org.eclipse.core.resources;bundle-version="3.9.1",
10+
org.eclipse.ui.forms;bundle-version="3.6.100",
11+
org.eclipse.core.databinding,
12+
org.eclipse.core.databinding.beans,
13+
org.eclipse.core.databinding.observable,
14+
org.eclipse.core.databinding.property,
15+
org.eclipse.jface.databinding,
16+
org.eclipse.swt,
17+
org.eclipse.cdt.core,
18+
org.eclipse.ui.console,
19+
com.googlecode.plist.dd-plist;bundle-version="1.21.0",
20+
com.google.guava;bundle-version="26.0.0",
21+
org.apache.commons.lang;bundle-version="3.0.0",
22+
org.apache.commons.exec;bundle-version="1.3.0",
23+
joda-time;bundle-version="2.10.1",
24+
com.google.gson;bundle-version="2.3.1",
25+
log4j;bundle-version="1.2.17",
26+
org.eclipse.jdt.annotation;bundle-version="2.1.100"
27+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
28+
Export-Package: org.codechecker.eclipse.plugin,
29+
org.codechecker.eclipse.plugin.runtime

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/build.properties renamed to bundles/org.codechecker.eclipse.plugin/build.properties

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ bin.includes = plugin.xml,\
55
.,\
66
icons/,\
77
contexts.xml,\
8-
lib/*.jar,\
9-
log4j.properties,\
10-
lib/jsr305.jar
8+
log4j.properties
119

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/plugin.xml renamed to bundles/org.codechecker.eclipse.plugin/plugin.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@
55
<extension
66
point="org.eclipse.ui.commands">
77
<command
8-
defaultHandler="cc.codechecker.plugin.command.AddProjectNature"
9-
id="cc.codechecker.plugin.addCcNatureCommand"
8+
defaultHandler="org.codechecker.eclipse.plugin.command.AddProjectNature"
9+
id="org.codechecker.eclipse.plugin.addCcNatureCommand"
1010
name="AddCodeCheckerNature">
1111
</command>
1212
</extension>
1313
<extension point="org.eclipse.ui.propertyPages">
1414
<page
15-
class="cc.codechecker.plugin.config.project.CcProjectProperties"
16-
id="cc.codechecker.plugin.config.ccProperties"
15+
class="org.codechecker.eclipse.plugin.config.project.CcProjectProperties"
16+
id="org.codechecker.eclipse.plugin.config.ccProperties"
1717
name="CodeChecker">
1818
<enabledWhen>
1919
<adapt type="org.eclipse.core.resources.IProject">
2020
<test property="org.eclipse.core.resources.projectNature"
21-
value="cc.codechecker.plugin.CodeCheckerNature"/>
21+
value="org.codechecker.eclipse.plugin.CodeCheckerNature"/>
2222
</adapt>
2323
</enabledWhen>
2424
</page>
2525
</extension>
2626
<extension point="org.eclipse.ui.preferencePages">
2727
<page id="CcConfiguration"
2828
name="CodeChecker"
29-
class="cc.codechecker.plugin.config.global.CcGlobalProperties">
29+
class="org.codechecker.eclipse.plugin.config.global.CcGlobalProperties">
3030
</page>
3131
</extension>
3232
<extension point="org.eclipse.ui.menus">
3333
<menuContribution
3434
locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">
3535
<command
36-
commandId="cc.codechecker.plugin.addCcNatureCommand"
36+
commandId="org.codechecker.eclipse.plugin.addCcNatureCommand"
3737
label="Add CodeChecker Nature"
3838
style="push">
3939
<visibleWhen>
4040
<iterate operator="and">
4141
<not>
4242
<test property="org.eclipse.core.resources.projectNature"
43-
value="cc.codechecker.plugin.CodeCheckerNature"/>
43+
value="org.codechecker.eclipse.plugin.CodeCheckerNature"/>
4444
</not>
4545
<or>
4646
<test property="org.eclipse.core.resources.projectNature"
@@ -76,34 +76,34 @@
7676
point="org.eclipse.ui.views">
7777
<category
7878
name="CodeChecker"
79-
id="cc.codechecker.plugin.CodeChecker">
79+
id="org.codechecker.eclipse.plugin.CodeChecker">
8080
</category>
8181
<view
8282
name="Current File"
8383
icon="icons/sample.gif"
84-
category="cc.codechecker.plugin.CodeChecker"
85-
class="cc.codechecker.plugin.views.report.list.ReportListView"
86-
id="cc.codechecker.plugin.views.ReportList">
84+
category="org.codechecker.eclipse.plugin.CodeChecker"
85+
class="org.codechecker.eclipse.plugin.views.report.list.ReportListView"
86+
id="org.codechecker.eclipse.plugin.views.ReportList">
8787
</view>
8888
<view
8989
name="Current Project"
9090
icon="icons/sample.gif"
91-
category="cc.codechecker.plugin.CodeChecker"
92-
class="cc.codechecker.plugin.views.report.list.ReportListViewProject"
93-
id="cc.codechecker.plugin.views.ReportListProject">
91+
category="org.codechecker.eclipse.plugin.CodeChecker"
92+
class="org.codechecker.eclipse.plugin.views.report.list.ReportListViewProject"
93+
id="org.codechecker.eclipse.plugin.views.ReportListProject">
9494
</view>
9595
<view
9696
name="Custom Config"
9797
icon="icons/sample.gif"
98-
category="cc.codechecker.plugin.CodeChecker"
99-
class="cc.codechecker.plugin.views.report.list.ReportListViewCustom"
100-
id="cc.codechecker.plugin.views.ReportListViewCustom">
98+
category="org.codechecker.eclipse.plugin.CodeChecker"
99+
class="org.codechecker.eclipse.plugin.views.report.list.ReportListViewCustom"
100+
id="org.codechecker.eclipse.plugin.views.ReportListViewCustom">
101101
</view>
102102
</extension>
103103
<extension
104104
point="org.eclipse.ui.console.consoleFactories">
105105
<consoleFactory
106-
class="cc.codechecker.plugin.views.console.ConsoleFactory"
106+
class="org.codechecker.eclipse.plugin.views.console.ConsoleFactory"
107107
icon="icons/sample.gif"
108108
label="CodeChecker Console">
109109
</consoleFactory>
@@ -117,25 +117,25 @@
117117
<extension
118118
point="org.eclipse.ui.perspectives">
119119
<perspective
120-
class="cc.codechecker.plugin.perspective.CodeCheckerPerspectiveFactory"
121-
id="cc.codechecker.eclipse.plugin.checkerPerspective"
120+
class="org.codechecker.eclipse.plugin.perspective.CodeCheckerPerspectiveFactory"
121+
id="cc.codechecker.eclipse.checkerPerspective"
122122
name="CodeChecker">
123123
</perspective>
124124
</extension>
125125
<extension
126-
id="cc.codechecker.plugin.CodeCheckerNature"
126+
id="org.codechecker.eclipse.plugin.CodeCheckerNature"
127127
point="org.eclipse.core.resources.natures">
128128
<runtime>
129129
<run
130-
class="cc.codechecker.plugin.CodeCheckerNature">
130+
class="org.codechecker.eclipse.plugin.CodeCheckerNature">
131131
</run>
132132
</runtime>
133133
</extension>
134134
<!-- TODO: remove this dependency!!! -->
135135
<extension
136136
point="org.eclipse.ui.startup">
137137
<startup
138-
class="cc.codechecker.plugin.Activator">
138+
class="org.codechecker.eclipse.plugin.Activator">
139139
</startup>
140140
</extension>
141141

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/src/cc/codechecker/plugin/Activator.java renamed to bundles/org.codechecker.eclipse.plugin/src/org/codechecker/eclipse/plugin/Activator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cc.codechecker.plugin;
1+
package org.codechecker.eclipse.plugin;
22

3-
import cc.codechecker.plugin.config.CodeCheckerContext;
3+
import org.codechecker.eclipse.plugin.config.CodeCheckerContext;
44

55
import org.eclipse.cdt.utils.Platform;
66
import org.eclipse.core.runtime.FileLocator;
@@ -13,8 +13,8 @@
1313
import org.osgi.framework.Bundle;
1414
import org.osgi.framework.BundleContext;
1515

16-
import cc.codechecker.plugin.init.StartupJob;
17-
import cc.codechecker.plugin.views.console.ConsoleFactory;
16+
import org.codechecker.eclipse.plugin.init.StartupJob;
17+
import org.codechecker.eclipse.plugin.views.console.ConsoleFactory;
1818

1919
import java.net.URL;
2020

@@ -26,7 +26,7 @@
2626
public class Activator extends AbstractUIPlugin implements IStartup {
2727

2828
// The plug-in ID
29-
public static final String PLUGIN_ID = "cc.codechecker.eclipse.plugin"; //$NON-NLS-1$
29+
public static final String PLUGIN_ID = "org.codechecker.eclipse.plugin"; //$NON-NLS-1$
3030

3131
// The shared instance
3232
private static Activator plugin;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package cc.codechecker.plugin;
1+
package org.codechecker.eclipse.plugin;
22

33
import org.eclipse.core.resources.IProject;
44
import org.eclipse.core.resources.IProjectNature;
55
import org.eclipse.core.runtime.CoreException;
66

7-
import cc.codechecker.plugin.config.CcConfiguration;
8-
import cc.codechecker.plugin.config.CodeCheckerContext;
7+
import org.codechecker.eclipse.plugin.config.CcConfiguration;
8+
import org.codechecker.eclipse.plugin.config.CodeCheckerContext;
99

1010
/**
1111
* Eclipse uses natures as project feature indicators.
@@ -14,7 +14,7 @@
1414
*/
1515
public class CodeCheckerNature implements IProjectNature {
1616

17-
public static final String NATURE_ID = "cc.codechecker.plugin.CodeCheckerNature";
17+
public static final String NATURE_ID = "org.codechecker.eclipse.plugin.CodeCheckerNature";
1818
IProject project;
1919

2020
@Override
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package cc.codechecker.plugin;
1+
package org.codechecker.eclipse.plugin;
22

3-
import cc.codechecker.plugin.runtime.LogI;
4-
import cc.codechecker.plugin.views.console.ConsoleFactory;;
3+
import org.codechecker.eclipse.plugin.runtime.LogI;
4+
import org.codechecker.eclipse.plugin.views.console.ConsoleFactory;;
55

66
//logger service for non plugin internal
77
//components (such as the codechecker service)

0 commit comments

Comments
 (0)