Don Brown avatar Don Brown committed 1886384

Cleanup of unused configuration, new plugin key

Comments (0)

Files changed (3)

 *.ipr
 *.iws
 data
+wiki
   	</organization>
 
     <properties>
-        <atlassian.plugin.key>remotehtml</atlassian.plugin.key>
-
         <atlassian.product.version>4.2.10</atlassian.product.version>
         <atlassian.product.data.version>3.5</atlassian.product.data.version>
         <atlassian.product.test-lib.version>2.2.2</atlassian.product.test-lib.version>
     </dependencyManagement>
 
     <dependencies>
-		<!--<dependency>-->
-			<!--<groupId>com.atlassian.confluence</groupId>-->
-			<!--<artifactId>confluence</artifactId>-->
-			<!--<version>${atlassian.product.version}</version>-->
-			<!--<scope>provided</scope>-->
-		<!--</dependency>-->
-		<!--<dependency>-->
-			<!--<groupId>rome</groupId>-->
-			<!--<artifactId>rome</artifactId>-->
-			<!--<version>1.0</version>-->
-			<!--<scope>provided</scope>-->
-		<!--</dependency>-->
-
         <dependency>
             <groupId>com.atlassian.plugins</groupId>
             <artifactId>remotable-plugins-servlet-kit</artifactId>
             <artifactId>jdom</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.8.4</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 	<build>
 				<version>4.1-rc4</version>
 				<extensions>true</extensions>
 				<configuration>
-                    <!-- Rome is the bane of all hell -->
-                    <!--<instructions>-->
-                        <!--<Import-Package>-->
-                            <!--com.atlassian.bandana*;version="3.1",-->
-                            <!--com.atlassian.confluence*;version="4.0",-->
-                            <!--com.atlassian.core*;version="4.5",-->
-                            <!--com.atlassian.renderer*;version="1.0",-->
-                            <!--com.atlassian.security.auth.trustedapps*;version="2.3"-->
-                            <!--com.opensymphony.module.sitemesh*;version="2.3",-->
-                            <!--com.opensymphony.util*;version="2.2",-->
-                            <!--com.opensymphony.xwork*;version="1.0",-->
-                            <!--com.sun.syndication*;version="1.0",-->
-                            <!--org.apache.commons.io*;version="1.4",-->
-                            <!--org.apache.commons.lang*;version="2.4"-->
-                            <!--org.cyberneko.html.parsers*;version="1.9",-->
-                            <!--org.dom4j*;version="1.4",-->
-                            <!--org.slf4j*;version="1.5",-->
-                            <!--org.w3c.dom*;version="0.0",-->
-                            <!--org.w3c.tidy*;version="0.0"-->
-                        <!--</Import-Package>-->
-                    <!--</instructions>-->
                     <jvmArgs>${jvmArgs}</jvmArgs>
 					<productVersion>${atlassian.product.version}</productVersion>
 					<productDataVersion>${atlassian.product.data.version}</productDataVersion>

src/main/resources/atlassian-plugin.xml

-<atlassian-plugin name='${project.name}' key='remotehtml' plugins-version="2"
+<atlassian-plugin name='${project.name}' key='confluence-remote-html-macros' plugins-version="2"
         xmlns="https://remoteapps.jira.com/wiki/rest/remotable-plugins/1/installer/schema/atlassian-plugin">
     <plugin-info>
         <description><![CDATA[${project.description}]]></description>
     
     <webhook key="register" event="remote_plugin_installed" url="/" />
 
-    <!--<resource type="i18n" name="i18n" location="com.atlassian.confluence.plugins.macros.html.html" />-->
-
-    <!--<component name="Whitelist Manager Component" -->
-        <!--key="whitelistManager" -->
-        <!--class="com.atlassian.confluence.plugins.macros.html.DefaultWhitelistManager">-->
-    <!--</component>-->
-
-    <!--<web-item key="whitelistconfiguration" name="Whitelist Configuration" section="system.admin/configuration" weight="200">-->
-        <!--<label key="whitelist.configure-link" />-->
-        <!--<link>/admin/plugins/whitelist/configure.action</link>-->
-    <!--</web-item>      -->
-      <!---->
-    <!--<macro name='html' class='com.atlassian.confluence.plugins.macros.html.SimpleInlineHtmlMacro' key='html' state="disabled">-->
-        <!--<category name="formatting" />-->
-        <!--<description>Use HTML code within a Confluence page (Legacy)</description>-->
-    <!--</macro>-->
-    <!--<xhtml-macro key="html-xhtml" name="html" class="com.atlassian.confluence.plugins.macros.html.SimpleInlineHtmlMacro" state="disabled">-->
-    	<!--<category name="formatting" />-->
-        <!--<description>Use HTML code within a Confluence page</description>-->
-    <!--</xhtml-macro>-->
-    <!--<macro-migrator key="html-migration"-->
-                    <!--macro-name="html"-->
-                    <!--state="disabled"-->
-                    <!--class="com.atlassian.confluence.plugins.macros.html.SimpleInlineMacroMigration"/>-->
-
-    <!--<macro name='html-include' class='com.atlassian.confluence.plugins.macros.html.HtmlIncludeMacro' key='html-include' state="disabled">-->
-       	<!--<category name="external-content" />-->
-        <!--<description>Retrieve an external HTML file and include it in the page (Legacy)</description>-->
-    <!--</macro>-->
-    <!--<xhtml-macro key="html-include-xhtml" name="html-include" class="com.atlassian.confluence.plugins.macros.html.HtmlIncludeMacro" state="disabled">-->
-    	<!--<category name="external-content" />-->
-        <!--<description>Retrieve an external HTML file and include it in the page</description>-->
-    <!--</xhtml-macro>-->
-    
     <remote-macro name='RSS Inline' key='rss-inline' url="/rssInline" icon-url="/public/icons/rssfeed.png">
         <description>Embeds an RSS feed and summarises it directly in the page, sanitizing the contents</description>
         <category name="external-content" />
         </parameters>
     </remote-macro>
 
+    <!-- Not allowing the page macro yet due to need for styling -->
     <!--<macro-page name='RSS Page' key='rss-page' url="/rssPage" icon-url="/public/icons/rssfeed.png">-->
         <!--<description>Embeds an RSS feed and summarises it in a sandboxed area with the formatting intact</description>-->
         <!--<category name="external-content" />-->
         <!--</parameters>-->
     <!--</macro-page>-->
 
-    <!--<xhtml-macro key="rss-xhtml" name="rss" class="servlets.RssServletet">-->
-    	 <!--<category name="external-content" />-->
-        <!--<description>Retrieve a remote RSS feed and summarise it in the page</description>-->
-    <!--</xhtml-macro>-->
-    <!---->
-    <!--<xwork name="Configure Whitelist" key="configure-whitelist">-->
-        <!--<package name="whitelist" extends="default" namespace="/admin/plugins/whitelist">-->
-            <!--<default-interceptor-ref name="defaultStack"/>-->
-            <!--<action name="configure" class="com.atlassian.confluence.plugins.macros.html.config.ConfigureWhitelistAction" method="input">-->
-                <!--<result name="error" type="velocity">/com/atlassian/confluence/plugins/macros/html/config/configure-whitelist.vm</result>-->
-                <!--<result name="success" type="velocity">/com/atlassian/confluence/plugins/macros/html/config/configure-whitelist.vm</result>-->
-            <!--</action>-->
-            <!--<action name="save" class="com.atlassian.confluence.plugins.macros.html.config.ConfigureWhitelistAction" method="save">-->
-                <!--<interceptor-ref name="validatingStack"/>-->
-                <!--<param name="RequireSecurityToken">true</param>-->
-                <!--<result name="success" type="velocity">/com/atlassian/confluence/plugins/macros/html/config/configure-whitelist.vm</result>-->
-                <!--<result name="error" type="velocity">/com/atlassian/confluence/plugins/macros/html/config/configure-whitelist.vm</result>-->
-                <!--<result name="input" type="velocity">/com/atlassian/confluence/plugins/macros/html/config/configure-whitelist.vm</result>-->
-            <!--</action>-->
-
-        <!--</package>-->
-    <!--</xwork>-->
-    <!---->
-    <!--<web-resource name='whitelist web resources' key='whitelist-resources'>-->
-        <!--<description>Stylesheets and Scripts used by the RSS Macro</description>-->
-        <!--<resource name="whitelist/configure-whitelist.css"-->
-                  <!--type="download"-->
-                  <!--location="com/atlassian/confluence/plugins/macros/html/config/configure-whitelist.css"/>-->
-        <!--<resource name="whitelist/configure-whitelist.js"-->
-                  <!--type="download"-->
-                  <!--location="com/atlassian/confluence/plugins/macros/html/config/configure-whitelist.js"/>-->
-    <!--</web-resource>  -->
-
-    
-    
 </atlassian-plugin>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.