Skip to content

Commit

Permalink
Corrected bug causing save space to 404.
Browse files Browse the repository at this point in the history
  • Loading branch information
brettryan committed Sep 24, 2012
1 parent ab31582 commit a69bb8a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
<groupId>com.drunkendev.confluence.plugins</groupId>
<artifactId>attachment-tools-plugin</artifactId>
<name>Attachment Tools Plugin</name>
<version>1.0.1</version>
<version>1.0.2</version>

<properties>
<confluence.version>4.3</confluence.version>
<confluence.data.version>4.3</confluence.data.version>
<amps.version>3.11</amps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>dd</netbeans.hint.license>
<key>${project.groupId}.${project.artifactId}</key>
</properties>

<dependencies>
Expand Down Expand Up @@ -63,7 +62,8 @@
</dependencies>

<build>

<!--
This is removing ${spaceKey} from the atlassian-plugin.xml file.
<resources>
<resource>
<directory>src/main/resources</directory>
Expand All @@ -82,7 +82,7 @@
</includes>
</resource>
</resources>

-->
<plugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/atlassian-plugin.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<atlassian-plugin key="${key}"
<atlassian-plugin key="${project.groupId}.${project.artifactId}"
name="${project.name}"
plugins-version="2">

Expand All @@ -12,7 +12,7 @@
<param name="configure.url">/admin/plugins/attachment-tools/configure.action</param>
</plugin-info>

<component key="${key}.purge-attachment-service"
<component key="${project.groupId}.${project.artifactId}.purge-attachment-service"
name="Purge Attachment Settings Service"
alias="purgeAttSettingService"
class="com.drunkendev.confluence.plugins.attachments.PurgeAttachmentsSettingsService"/>
Expand All @@ -25,11 +25,11 @@
name="Configure Purge Attachments (Space)"
section="system.space.admin/spaceops"
weight="40">
<label key="${key}.config.purge"/>
<label key="${project.groupId}.${project.artifactId}.config.purge"/>
<link>/spaces/configure-purge-attachments-space.action?key=$helper.space.key</link>
<condition class="com.drunkendev.confluence.plugins.attachments.ConfigurePurgeAttachmentsSpaceCondition"/>
<icon height="16" width="16">
<link>/download/resources/${key}:purge-attachment-images/images/paperclip-icon.png</link>
<link>/download/resources/${project.groupId}.${project.artifactId}:purge-attachment-images/images/paperclip-icon.png</link>
</icon>
</web-item>

Expand Down

0 comments on commit a69bb8a

Please sign in to comment.