Skip to content

Commit 8b9a02f

Browse files
menachermenacher
committed
Issue #38 Dependency to aspectj is removed.
1 parent a07bb68 commit 8b9a02f

File tree

11 files changed

+125
-574
lines changed

11 files changed

+125
-574
lines changed

‎jetclient/pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,34 @@
99
<url>https://github.com/menacher/java-game-server/tree/master/jetclient</url>
1010
<description>This is a client library for jetserver https://github.com/menacher/java-game-server/tree/master/jetserver. Java clients can use this program to connect and interact with jetserver.</description>
1111

12+
<parent>
13+
<groupId>org.sonatype.oss</groupId>
14+
<artifactId>oss-parent</artifactId>
15+
<version>7</version>
16+
</parent>
17+
18+
<licenses>
19+
<license>
20+
<name>GNU Lesser General Public License (LGPL), Version 2.1</name>
21+
<url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
22+
<distribution>repo</distribution>
23+
</license>
24+
</licenses>
25+
26+
<scm>
27+
<connection>scm:git:git@github.com:menacher/java-game-server.git</connection>
28+
<developerConnection>scm:git:git@github.com:menacher/java-game-server.git</developerConnection>
29+
<url>git@github.com:menacher/java-game-server.git</url>
30+
</scm>
31+
32+
<developers>
33+
<developer>
34+
<id>menacher</id>
35+
<name>Abraham Menacherry</name>
36+
<email>abrahammenacherry@gmail.com</email>
37+
</developer>
38+
</developers>
39+
1240
<properties>
1341
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1442
</properties>

‎jetserver/.classpath

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<classpath>
2-
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.aj|**/*.java|**/*.aj"/>
3-
<classpathentry kind="src" path="src/main/java" including="**/*.aj|**/*.java|**/*.aj"/>
2+
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
3+
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
44
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
55
<classpathentry kind="output" path="target/classes"/>
66
<classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
@@ -59,5 +59,4 @@
5959
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.1.0.RELEASE/spring-core-3.1.0.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.1.0.RELEASE/spring-core-3.1.0.RELEASE-sources.jar"/>
6060
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.1.0.RELEASE/spring-expression-3.1.0.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.1.0.RELEASE/spring-expression-3.1.0.RELEASE-sources.jar"/>
6161
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
62-
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
6362
</classpath>

‎jetserver/.project

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<projects/>
55
<buildSpec>
66
<buildCommand>
7-
<name>org.eclipse.ajdt.core.ajbuilder</name>
7+
<name>org.eclipse.jdt.core.javabuilder</name>
88
</buildCommand>
99
</buildSpec>
1010
<natures>
11-
<nature>org.eclipse.ajdt.ui.ajnature</nature>
1211
<nature>org.eclipse.jdt.core.javanature</nature>
1312
<nature>org.springframework.ide.eclipse.core.springnature</nature>
1413
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

‎jetserver/build.xml

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,65 @@
1-
<?xml version="1.0"?>
2-
<project name="jetserver" default="deploy" basedir=".">
3-
<property name="src" value="${basedir}/src/main/java" />
4-
<property name="build" value="${basedir}/build" />
5-
<property name="classes" value="${build}/classes" />
6-
<property name="lib" value="${basedir}/lib" />
7-
<property name="jar-file" value="${build}/${ant.project.name}-0.1.jar" />
8-
<property name="deploy" value="${basedir}/target" />
9-
<property name="aspectjrt" value="${lib}/aspectjrt-1.6.1.jar" />
10-
<property name="aspectjtools" value="${lib}/aspectjtools-1.6.1.jar" />
11-
12-
<!--============================================================== -->
13-
<!--======================== JAR FILE LOCATIONS ================== -->
14-
<!--============================================================== -->
15-
<path id="server.classpath">
16-
<fileset dir="${lib}" includes="*.jar" />
17-
</path>
18-
19-
<!--============================================================== -->
20-
<!--======================= AspectJ TASK DEFINITIONS ============= -->
21-
<!--============================================================== -->
22-
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
23-
<classpath>
24-
<pathelement location="${aspectjtools}" />
25-
</classpath>
26-
</taskdef>
27-
28-
<!--============================================================== -->
29-
<!--=========================== TARGETS ========================== -->
30-
<!--============================================================== -->
31-
<target name="clean">
32-
<delete dir="${build}" />
33-
<delete dir="${deploy}" />
34-
</target>
35-
36-
<target name="prepare" depends="clean">
37-
<mkdir dir="${build}" />
38-
<mkdir dir="${classes}" />
39-
<mkdir dir="${deploy}" />
40-
</target>
41-
42-
<target name="compile" depends="prepare">
43-
<!-- <javac srcdir="${src}" destdir="${classes}" classpathref="server.classpath" /> -->
44-
<iajc debug="true" destdir="${classes}" source="1.6" classpathRef="server.classpath">
45-
<sourceroots>
46-
<pathelement location="${src}" />
47-
</sourceroots>
48-
</iajc>
49-
</target>
50-
51-
52-
<target name="jar" depends="compile">
53-
<jar destfile="${jar-file}" basedir="${classes}" />
54-
</target>
55-
56-
<!--============================================================== -->
57-
<!--================= COPY JAR TO TARGET DIRECTORY =============== -->
58-
<!--============================================================== -->
59-
<target name="deploy" depends="jar">
60-
<copy file="${jar-file}" todir="${deploy}" />
61-
</target>
62-
1+
<?xml version="1.0"?>
2+
<project name="jetserver" default="deploy" basedir=".">
3+
<property name="src" value="${basedir}/src/main/java" />
4+
<property name="build" value="${basedir}/build" />
5+
<property name="classes" value="${build}/classes" />
6+
<property name="lib" value="${basedir}/lib" />
7+
<property name="jar-file" value="${build}/${ant.project.name}-0.1.jar" />
8+
<property name="deploy" value="${basedir}/target" />
9+
<property name="aspectjrt" value="${lib}/aspectjrt-1.6.1.jar" />
10+
<property name="aspectjtools" value="${lib}/aspectjtools-1.6.1.jar" />
11+
12+
<!--============================================================== -->
13+
<!--======================== JAR FILE LOCATIONS ================== -->
14+
<!--============================================================== -->
15+
<path id="server.classpath">
16+
<fileset dir="${lib}" includes="*.jar" />
17+
</path>
18+
19+
<!--============================================================== -->
20+
<!--======================= AspectJ TASK DEFINITIONS ============= -->
21+
<!--============================================================== -->
22+
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
23+
<classpath>
24+
<pathelement location="${aspectjtools}" />
25+
</classpath>
26+
</taskdef>
27+
28+
<!--============================================================== -->
29+
<!--=========================== TARGETS ========================== -->
30+
<!--============================================================== -->
31+
<target name="clean">
32+
<delete dir="${build}" />
33+
<delete dir="${deploy}" />
34+
</target>
35+
36+
<target name="prepare" depends="clean">
37+
<mkdir dir="${build}" />
38+
<mkdir dir="${classes}" />
39+
<mkdir dir="${deploy}" />
40+
</target>
41+
42+
<target name="compile" depends="prepare">
43+
<javac srcdir="${src}" destdir="${classes}" classpathref="server.classpath" />
44+
<!--
45+
<iajc debug="true" destdir="${classes}" source="1.6" classpathRef="server.classpath">
46+
<sourceroots>
47+
<pathelement location="${src}" />
48+
</sourceroots>
49+
</iajc>
50+
-->
51+
</target>
52+
53+
54+
<target name="jar" depends="compile">
55+
<jar destfile="${jar-file}" basedir="${classes}" />
56+
</target>
57+
58+
<!--============================================================== -->
59+
<!--================= COPY JAR TO TARGET DIRECTORY =============== -->
60+
<!--============================================================== -->
61+
<target name="deploy" depends="jar">
62+
<copy file="${jar-file}" todir="${deploy}" />
63+
</target>
64+
6365
</project>

‎jetserver/lib/aspectjrt-1.6.1.jar

-112 KB
Binary file not shown.

‎jetserver/lib/aspectjtools-1.6.1.jar

-8.54 MB
Binary file not shown.

‎jetserver/pom.xml

Lines changed: 30 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<url>https://github.com/menacher/java-game-server/tree/master/jetserver</url>
1010
<description>Jetserver is a high speed socket based java game server written using JBoss Netty and Mike Rettig's Jetlang.It is specifically tuned for network based multiplayer games and supports TCP and UDP network protocols.</description>
1111

12+
<parent>
13+
<groupId>org.sonatype.oss</groupId>
14+
<artifactId>oss-parent</artifactId>
15+
<version>7</version>
16+
</parent>
17+
1218
<licenses>
1319
<license>
1420
<name>GNU Lesser General Public License (LGPL), Version 2.1</name>
@@ -17,7 +23,20 @@
1723
</license>
1824
</licenses>
1925

20-
26+
<scm>
27+
<connection>scm:git:git@github.com:menacher/java-game-server.git</connection>
28+
<developerConnection>scm:git:git@github.com:menacher/java-game-server.git</developerConnection>
29+
<url>git@github.com:menacher/java-game-server.git</url>
30+
</scm>
31+
32+
<developers>
33+
<developer>
34+
<id>menacher</id>
35+
<name>Abraham Menacherry</name>
36+
<email>abrahammenacherry@gmail.com</email>
37+
</developer>
38+
</developers>
39+
2140
<!-- Shared version number properties -->
2241
<properties>
2342
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -123,18 +142,21 @@
123142
<version>2.2.2</version>
124143
</dependency>
125144

126-
<dependency>
127-
<groupId>org.aspectj</groupId>
128-
<artifactId>aspectjrt</artifactId>
129-
<version>1.6.1</version>
130-
<scope>compile</scope>
131-
</dependency>
132-
133145
</dependencies>
134146

135147
<build>
136148
<plugins>
137149

150+
<plugin>
151+
<artifactId>maven-compiler-plugin</artifactId>
152+
<version>3.0</version>
153+
<configuration>
154+
<source>1.6</source>
155+
<target>1.6</target>
156+
<encoding>${project.build.sourceEncoding}</encoding>
157+
</configuration>
158+
</plugin>
159+
138160
<plugin>
139161
<groupId>org.apache.maven.plugins</groupId>
140162
<artifactId>maven-source-plugin</artifactId>
@@ -175,56 +197,17 @@
175197
<artifactId>maven-eclipse-plugin</artifactId>
176198
<version>2.8</version>
177199
<configuration>
178-
<ajdtVersion>1.6</ajdtVersion>
179200
<additionalProjectnatures>
180-
<projectnature>org.eclipse.ajdt.ui.ajnature</projectnature>
181201
<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
182202
<projectnature>org.eclipse.wst.common.project.facet.core.nature</projectnature>
183203
</additionalProjectnatures>
184-
<!-- Source includes is necessary to allow aj files in the java
185-
folder, else eclipse will throw a filtering exception -->
186-
<sourceIncludes>
187-
<sourceInclude>**/*.aj</sourceInclude>
188-
</sourceIncludes>
189204
<!-- Download sources will make maven download and attach source files
190205
where available -->
191206
<downloadSources>true</downloadSources>
192207
<downloadJavadocs>true</downloadJavadocs>
193208
</configuration>
194209
</plugin>
195210

196-
<plugin>
197-
<groupId>org.codehaus.mojo</groupId>
198-
<artifactId>aspectj-maven-plugin</artifactId>
199-
<version>1.4</version>
200-
<dependencies>
201-
<dependency>
202-
<groupId>org.aspectj</groupId>
203-
<artifactId>aspectjrt</artifactId>
204-
<version>1.6.1</version>
205-
</dependency>
206-
<dependency>
207-
<groupId>org.aspectj</groupId>
208-
<artifactId>aspectjtools</artifactId>
209-
<version>1.6.1</version>
210-
</dependency>
211-
</dependencies>
212-
<configuration>
213-
<source>1.6</source>
214-
<complianceLevel>1.6</complianceLevel>
215-
<verbose>true</verbose>
216-
<showWeaveInfo>true</showWeaveInfo>
217-
<target>1.6</target>
218-
</configuration>
219-
<executions>
220-
<execution>
221-
<goals>
222-
<goal>compile</goal>
223-
<goal>test-compile</goal>
224-
</goals>
225-
</execution>
226-
</executions>
227-
</plugin>
228211

229212
</plugins>
230213

‎jetserver/src/main/java/org/menacheri/jetserver/aspect/AppManaged.java

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

0 commit comments

Comments
 (0)