Skip to content

Commit 54985d8

Browse files
BrynCookeBrynCooke
committed
Initial java annotation implementation.
1 parent 13b0d6c commit 54985d8

17 files changed

+947
-191
lines changed

‎CHANGELOG.textile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ h3. Version 2.4.0 (NOT OFFICIALLY RELEASED YET)
1515
</dependency>
1616
```
1717

18+
* @JavaHandler@ to support using Java to handle frame methods
1819
* Framing a null element returns null
1920
* Fixed NPE when enum property type set to null
2021
* Inheritance/Poymorphism support

‎pom.xml

Lines changed: 174 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -1,184 +1,184 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>org.sonatype.oss</groupId>
7-
<artifactId>oss-parent</artifactId>
8-
<version>7</version>
9-
</parent>
10-
<groupId>com.tinkerpop</groupId>
11-
<artifactId>frames</artifactId>
12-
<version>2.4.0-SNAPSHOT</version>
13-
<packaging>jar</packaging>
14-
<url>http://frames.tinkerpop.com</url>
15-
<name>Frames: An Object to Graph Framework</name>
16-
<description>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.sonatype.oss</groupId>
7+
<artifactId>oss-parent</artifactId>
8+
<version>7</version>
9+
</parent>
10+
<groupId>com.tinkerpop</groupId>
11+
<artifactId>frames</artifactId>
12+
<version>2.4.0-SNAPSHOT</version>
13+
<packaging>jar</packaging>
14+
<url>http://frames.tinkerpop.com</url>
15+
<name>Frames: An Object to Graph Framework</name>
16+
<description>
1717
Frames is a framework for exposing the elements of a Blueprints graph as Java objects.
1818
Instead of writing software in terms of vertices and edges, with Frames,
1919
software is written in terms of domain objects and their relationships to each other.
2020
</description>
21-
<properties>
22-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
</properties>
24-
<developers>
25-
<developer>
26-
<name>Marko A. Rodriguez</name>
27-
<email>[email protected]</email>
28-
<url>http://markorodriguez.com</url>
29-
</developer>
30-
<developer>
31-
<name>Joshua Shinavier</name>
32-
<email>[email protected]</email>
33-
<url>http://fortytwo.net</url>
34-
</developer>
35-
<developer>
36-
<name>Bryn Cooke</name>
37-
<email>[email protected]</email>
38-
<url>http://jglue.org</url>
39-
</developer>
40-
</developers>
41-
<inceptionYear>2011</inceptionYear>
42-
<licenses>
43-
<license>
44-
<name>BSD 3-Clause</name>
45-
<url>http://www.opensource.org/licenses/BSD-3-Clause</url>
46-
</license>
47-
</licenses>
48-
<scm>
49-
<connection>scm:git:[email protected]:tinkerpop/frames.git</connection>
50-
<developerConnection>scm:git:[email protected]:tinkerpop/frames.git</developerConnection>
51-
<url>[email protected]:tinkerpop/frames.git</url>
52-
</scm>
53-
<dependencies>
54-
<dependency>
55-
<groupId>com.tinkerpop.blueprints</groupId>
56-
<artifactId>blueprints-core</artifactId>
57-
<version>2.4.0-SNAPSHOT</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>com.tinkerpop.gremlin</groupId>
61-
<artifactId>gremlin-groovy</artifactId>
62-
<version>2.4.0-SNAPSHOT</version>
63-
</dependency>
64-
<!-- TEST -->
65-
<dependency>
66-
<groupId>junit</groupId>
67-
<artifactId>junit</artifactId>
68-
<version>4.5</version>
69-
<scope>test</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>com.tinkerpop.blueprints</groupId>
73-
<artifactId>blueprints-sail-graph</artifactId>
74-
<version>2.4.0-SNAPSHOT</version>
75-
<scope>test</scope>
76-
</dependency>
77-
<dependency>
78-
<groupId>com.tinkerpop.blueprints</groupId>
79-
<artifactId>blueprints-test</artifactId>
80-
<version>2.4.0-SNAPSHOT</version>
81-
<scope>test</scope>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.mockito</groupId>
85-
<artifactId>mockito-all</artifactId>
86-
<version>1.9.5</version>
87-
<scope>test</scope>
88-
</dependency>
89-
</dependencies>
90-
<build>
91-
<directory>${basedir}/target</directory>
92-
<finalName>${project.artifactId}-${project.version}
21+
<properties>
22+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23+
</properties>
24+
<developers>
25+
<developer>
26+
<name>Marko A. Rodriguez</name>
27+
<email>[email protected]</email>
28+
<url>http://markorodriguez.com</url>
29+
</developer>
30+
<developer>
31+
<name>Joshua Shinavier</name>
32+
<email>[email protected]</email>
33+
<url>http://fortytwo.net</url>
34+
</developer>
35+
<developer>
36+
<name>Bryn Cooke</name>
37+
<email>[email protected]</email>
38+
<url>http://jglue.org</url>
39+
</developer>
40+
</developers>
41+
<inceptionYear>2011</inceptionYear>
42+
<licenses>
43+
<license>
44+
<name>BSD 3-Clause</name>
45+
<url>http://www.opensource.org/licenses/BSD-3-Clause</url>
46+
</license>
47+
</licenses>
48+
<scm>
49+
<connection>scm:git:[email protected]:tinkerpop/frames.git</connection>
50+
<developerConnection>scm:git:[email protected]:tinkerpop/frames.git</developerConnection>
51+
<url>[email protected]:tinkerpop/frames.git</url>
52+
</scm>
53+
<dependencies>
54+
<dependency>
55+
<groupId>com.tinkerpop.blueprints</groupId>
56+
<artifactId>blueprints-core</artifactId>
57+
<version>2.4.0-SNAPSHOT</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.tinkerpop.gremlin</groupId>
61+
<artifactId>gremlin-groovy</artifactId>
62+
<version>2.4.0-SNAPSHOT</version>
63+
</dependency>
64+
<!-- TEST -->
65+
<dependency>
66+
<groupId>junit</groupId>
67+
<artifactId>junit</artifactId>
68+
<version>4.5</version>
69+
<scope>test</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>com.tinkerpop.blueprints</groupId>
73+
<artifactId>blueprints-sail-graph</artifactId>
74+
<version>2.4.0-SNAPSHOT</version>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>com.tinkerpop.blueprints</groupId>
79+
<artifactId>blueprints-test</artifactId>
80+
<version>2.4.0-SNAPSHOT</version>
81+
<scope>test</scope>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.mockito</groupId>
85+
<artifactId>mockito-all</artifactId>
86+
<version>1.9.5</version>
87+
<scope>test</scope>
88+
</dependency>
89+
90+
<dependency>
91+
<groupId>org.javassist</groupId>
92+
<artifactId>javassist</artifactId>
93+
<version>3.18.0-GA</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.google.guava</groupId>
97+
<artifactId>guava</artifactId>
98+
<version>14.0.1</version>
99+
</dependency>
100+
</dependencies>
101+
<build>
102+
<directory>${basedir}/target</directory>
103+
<finalName>${project.artifactId}-${project.version}
93104
</finalName>
94-
<resources>
95-
<resource>
96-
<directory>${basedir}/src/main/resources
105+
<resources>
106+
<resource>
107+
<directory>${basedir}/src/main/resources
97108
</directory>
98-
</resource>
99-
</resources>
100-
<testResources>
101-
<testResource>
102-
<directory>${basedir}/src/test/resources
109+
</resource>
110+
</resources>
111+
<testResources>
112+
<testResource>
113+
<directory>${basedir}/src/test/resources
103114
</directory>
104-
</testResource>
105-
</testResources>
106-
<plugins>
107-
<plugin>
108-
<artifactId>maven-compiler-plugin</artifactId>
109-
<version>2.3.2</version>
110-
<configuration>
111-
<source>1.6</source>
112-
<target>1.6</target>
113-
</configuration>
114-
</plugin>
115-
<plugin>
116-
<artifactId>maven-assembly-plugin</artifactId>
117-
<version>2.3</version>
118-
<executions>
119-
<execution>
120-
<phase>package</phase>
121-
<goals>
122-
<goal>attached</goal>
123-
</goals>
124-
</execution>
125-
</executions>
126-
<configuration>
127-
<attach>false</attach>
128-
<descriptors>
129-
<descriptor>src/assembly/distribution.xml</descriptor>
130-
</descriptors>
131-
<finalName>frames-${project.version}</finalName>
132-
<outputDirectory>target</outputDirectory>
133-
<workDirectory>target/assembly/work</workDirectory>
134-
<tarLongFileMode>warn</tarLongFileMode>
135-
</configuration>
136-
</plugin>
137-
<plugin>
138-
<groupId>org.apache.maven.plugins</groupId>
139-
<artifactId>maven-surefire-plugin</artifactId>
140-
<version>2.4.2</version>
141-
</plugin>
142-
<plugin>
143-
<groupId>org.apache.maven.plugins</groupId>
144-
<artifactId>maven-source-plugin</artifactId>
145-
<version>2.1.2</version>
146-
<executions>
147-
<execution>
148-
<id>attach-sources</id>
149-
<goals>
150-
<goal>jar</goal>
151-
</goals>
152-
</execution>
153-
</executions>
154-
</plugin>
155-
<plugin>
156-
<groupId>org.apache.maven.plugins</groupId>
157-
<artifactId>maven-javadoc-plugin</artifactId>
158-
<version>2.8</version>
159-
<executions>
160-
<execution>
161-
<id>attach-javadocs</id>
162-
<goals>
163-
<goal>jar</goal>
164-
</goals>
165-
</execution>
166-
</executions>
167-
</plugin>
168-
<!--<plugin>
169-
<groupId>org.apache.maven.plugins</groupId>
170-
<artifactId>maven-gpg-plugin</artifactId>
171-
<version>1.4</version>
172-
<executions>
173-
<execution>
174-
<id>sign-artifacts</id>
175-
<phase>verify</phase>
176-
<goals>
177-
<goal>sign</goal>
178-
</goals>
179-
</execution>
180-
</executions>
181-
</plugin>-->
182-
</plugins>
183-
</build>
115+
</testResource>
116+
</testResources>
117+
<plugins>
118+
<plugin>
119+
<artifactId>maven-compiler-plugin</artifactId>
120+
<version>2.3.2</version>
121+
<configuration>
122+
<source>1.6</source>
123+
<target>1.6</target>
124+
</configuration>
125+
</plugin>
126+
<plugin>
127+
<artifactId>maven-assembly-plugin</artifactId>
128+
<version>2.3</version>
129+
<executions>
130+
<execution>
131+
<phase>package</phase>
132+
<goals>
133+
<goal>attached</goal>
134+
</goals>
135+
</execution>
136+
</executions>
137+
<configuration>
138+
<attach>false</attach>
139+
<descriptors>
140+
<descriptor>src/assembly/distribution.xml</descriptor>
141+
</descriptors>
142+
<finalName>frames-${project.version}</finalName>
143+
<outputDirectory>target</outputDirectory>
144+
<workDirectory>target/assembly/work</workDirectory>
145+
<tarLongFileMode>warn</tarLongFileMode>
146+
</configuration>
147+
</plugin>
148+
<plugin>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-surefire-plugin</artifactId>
151+
<version>2.4.2</version>
152+
</plugin>
153+
<plugin>
154+
<groupId>org.apache.maven.plugins</groupId>
155+
<artifactId>maven-source-plugin</artifactId>
156+
<version>2.1.2</version>
157+
<executions>
158+
<execution>
159+
<id>attach-sources</id>
160+
<goals>
161+
<goal>jar</goal>
162+
</goals>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
<plugin>
167+
<groupId>org.apache.maven.plugins</groupId>
168+
<artifactId>maven-javadoc-plugin</artifactId>
169+
<version>2.8</version>
170+
<executions>
171+
<execution>
172+
<id>attach-javadocs</id>
173+
<goals>
174+
<goal>jar</goal>
175+
</goals>
176+
</execution>
177+
</executions>
178+
</plugin>
179+
<!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId>
180+
<version>1.4</version> <executions> <execution> <id>sign-artifacts</id> <phase>verify</phase>
181+
<goals> <goal>sign</goal> </goals> </execution> </executions> </plugin> -->
182+
</plugins>
183+
</build>
184184
</project>

0 commit comments

Comments
 (0)