Stop using the old JSR250 annotation.
This will likely break a bunch of things because things further down the line were depending on narya bringing in this jar.
This commit is contained in:
Ray J. Greenwell
@@ -23,11 +23,6 @@
|
||||
<artifactId>guice</artifactId>
|
||||
<version>5.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>jsr250-api</artifactId>
|
||||
<version>1.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- optional dependencies -->
|
||||
<dependency>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.admin.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.admin.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationException;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.bureau.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.bureau.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.bureau.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationProvider;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.chat.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.chat.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.chat.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.chat.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationProvider;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.chat.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationProvider;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.peer.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
import com.threerings.presents.dobj.DSet;
|
||||
import com.threerings.presents.peer.data.NodeObject;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.peer.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.peer.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationProvider;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.crowd.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationException;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.client.InvocationReceiver;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.client.InvocationReceiver;
|
||||
import com.threerings.presents.client.RegistrationService;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.client.TimeBaseService;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.peer.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.peer.data;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.peer.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
package com.threerings.presents.server;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.client.InvocationReceiver;
|
||||
import com.threerings.presents.client.RegistrationService;
|
||||
|
||||
@@ -7,7 +7,7 @@ package com.threerings.presents.data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.client.TestService;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
package com.threerings.presents.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
import com.threerings.presents.dobj.OidList;
|
||||
|
||||
@@ -7,7 +7,7 @@ package com.threerings.presents.server;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.client.TestService;
|
||||
|
||||
@@ -231,7 +231,7 @@ public class GenServiceTask extends InvocationTask
|
||||
// import things marshaller will always need
|
||||
imports.add(sdesc.service);
|
||||
imports.add(InvocationMarshaller.class);
|
||||
imports.add("javax.annotation.Generated");
|
||||
imports.add("javax.annotation.processing.Generated");
|
||||
|
||||
// We only add a type parameter for the caller ClientObject type if the service has one
|
||||
if (sdesc.callerTypeSpecified) {
|
||||
@@ -512,7 +512,7 @@ public class GenServiceTask extends InvocationTask
|
||||
// import superclass and service
|
||||
imports.add(InvocationProvider.class);
|
||||
imports.add(sdesc.service);
|
||||
imports.add("javax.annotation.Generated");
|
||||
imports.add("javax.annotation.processing.Generated");
|
||||
|
||||
// any method that takes a listener may throw this
|
||||
if (sdesc.hasAnyListenerArgs()) {
|
||||
|
||||
@@ -203,7 +203,7 @@ public class SourceFile
|
||||
*/
|
||||
protected void addOrRemoveGeneratedImport (boolean add)
|
||||
{
|
||||
final String IMPORT = "import javax.annotation.Generated;";
|
||||
final String IMPORT = "import javax.annotation.processing.Generated;";
|
||||
|
||||
int packageLine = -1;
|
||||
int importLine = -1;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package {{package}};
|
||||
|
||||
import javax.annotation.Generated;
|
||||
import javax.annotation.processing.Generated;
|
||||
|
||||
{{#imports}}
|
||||
import {{this}};
|
||||
|
||||
Reference in New Issue
Block a user