Commits

Don Brown  committed d960b41

Migrate to pre-beta of plugins 3

  • Participants
  • Parent commits 28fcf86

Comments (0)

Files changed (4)

 #!/bin/sh
 
-java $JAVA_OPTS -jar target/remoteapps-container-standalone.jar target/websequencediagrams-app*.jar
+java $JAVA_OPTS -jar target/remotable-plugins-container-standalone.jar target/websequencediagrams-app*.jar
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.atlassian.labs.remoteapps</groupId>
+    <groupId>com.atlassian.labs</groupId>
     <version>0.1-SNAPSHOT</version>
     <artifactId>websequencediagrams-app</artifactId>
     <packaging>atlassian-plugin</packaging>
     <dependencies>
         <dependency>
-            <groupId>com.atlassian.labs</groupId>
-            <artifactId>remoteapps-api</artifactId>
-            <version>${remoteapps.version}</version>
+            <groupId>com.atlassian.plugins</groupId>
+            <artifactId>remotable-plugins-api</artifactId>
+            <version>${remotable.plugins.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.atlassian.labs</groupId>
-            <artifactId>remoteapps-servlet-kit</artifactId>
-            <version>${remoteapps.version}</version>
+            <groupId>com.atlassian.plugins</groupId>
+            <artifactId>remotable-plugins-servlet-kit</artifactId>
+            <version>${remotable.plugins.version}</version>
         </dependency>
 
         <dependency>
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>com.atlassian.labs</groupId>
-                                    <artifactId>remoteapps-container</artifactId>
+                                    <groupId>com.atlassian.plugins</groupId>
+                                    <artifactId>remotable-plugins-container</artifactId>
                                     <classifier>standalone</classifier>
-                                    <version>${remoteapps.version}</version>
+                                    <version>${remotable.plugins.version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <stripVersion>true</stripVersion>
     </scm>
 
     <properties>
-        <remoteapps.version>0.5.687</remoteapps.version>
+        <remotable.plugins.version>0.5.699</remotable.plugins.version>
     </properties>
 
 

File src/main/java/servlets/MacroServlet.java

 package servlets;
 
-import com.atlassian.labs.remoteapps.api.annotation.ServiceReference;
-import com.atlassian.labs.remoteapps.api.service.confluence.ConfluenceAttachmentClient;
-import com.atlassian.labs.remoteapps.api.service.confluence.ConfluencePageClient;
-import com.atlassian.labs.remoteapps.api.service.confluence.domain.Attachment;
-import com.atlassian.labs.remoteapps.api.service.confluence.domain.MutableAttachment;
-import com.atlassian.labs.remoteapps.api.service.http.EntityBuilders;
-import com.atlassian.labs.remoteapps.api.service.http.HttpClient;
-import com.atlassian.labs.remoteapps.api.service.http.Response;
+import com.atlassian.plugin.remotable.api.annotation.ServiceReference;
+import com.atlassian.plugin.remotable.api.service.confluence.ConfluenceAttachmentClient;
+import com.atlassian.plugin.remotable.api.service.confluence.ConfluencePageClient;
+import com.atlassian.plugin.remotable.api.service.confluence.domain.Attachment;
+import com.atlassian.plugin.remotable.api.service.confluence.domain.MutableAttachment;
+import com.atlassian.plugin.remotable.api.service.http.HttpClient;
+import com.atlassian.plugin.remotable.api.service.http.Response;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import java.net.UnknownHostException;
 import java.util.Map;
 
-import static com.atlassian.labs.remoteapps.api.service.confluence.domain.ConfluenceDomain
-        .newAttachment;
-import static com.atlassian.labs.remoteapps.api.service.http.EntityBuilders.newForm;
+import static com.atlassian.plugin.remotable.api.service.confluence.domain.ConfluenceDomain.newAttachment;
+import static com.atlassian.plugin.remotable.api.service.http.EntityBuilders.newForm;
 
 /**
  *

File src/main/resources/atlassian-plugin.xml

-<atlassian-plugin key="websequencediagrams-app" name="Web Sequence Diagrams" plugins-version="2"
-        xmlns="https://remoteapps.jira.com/wiki/rest/remoteapps/1/installer/schema/atlassian-plugin">
+<atlassian-plugin key="websequencediagrams-app" name="Web Sequence Diagrams" plugins-version="2">
     <plugin-info>
         <description>
             Web Sequence Diagrams macro