Skip to content

Commit

Permalink
Confluence 5.4 update.
Browse files Browse the repository at this point in the history
  • Loading branch information
@brettryan
brettryan committed Jun 24, 2014
1 parent 004bf89 commit 7480952
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 69 deletions.
86 changes: 41 additions & 45 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
<groupId>com.drunkendev.confluence.plugins</groupId>
<artifactId>attachment-tools-plugin</artifactId>
<name>Attachment Tools Plugin</name>
<version>1.0.2</version>
<version>1.0.3</version>

<properties>
<confluence.version>4.3</confluence.version>
<confluence.data.version>4.3</confluence.data.version>
<amps.version>3.11</amps.version>
<confluence.version>5.5.3</confluence.version>
<confluence.data.version>5.5.3</confluence.data.version>
<amps.version>5.0.3</amps.version>
<plugin.testrunner.version>1.2.0</plugin.testrunner.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>dd</netbeans.hint.license>
</properties>
Expand All @@ -27,62 +28,57 @@
<artifactId>confluence</artifactId>
<version>${confluence.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>connector</artifactId>
<groupId>javax.resource</groupId>
</exclusion>
</exclusions>
</dependency>

<!-- WIRED TEST RUNNER DEPENDENCIES -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<groupId>com.atlassian.plugins</groupId>
<artifactId>atlassian-plugins-osgi-testrunner</artifactId>
<version>${plugin.testrunner.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.atlassian.confluence.plugin</groupId>
<artifactId>func-test</artifactId>
<version>2.3</version>
<scope>test</scope>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
<artifactId>jwebunit-htmlunit-plugin</artifactId>
<version>2.2</version>
<scope>test</scope>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2-atlassian-1</version>
</dependency>

<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>1.9.12</version>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<!--
This is removing ${spaceKey} from the atlassian-plugin.xml file.
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
-->
<!--
This is removing ${spaceKey} from the atlassian-plugin.xml file.
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
-->
<plugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
Expand Down
37 changes: 18 additions & 19 deletions src/main/resources/templates/purge-attachments/config/configure-purge-attachments-common.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
<h2>Processing Rules</h2>

<div class="noteMacro" style="padding: 5px; margin-bottom: 10px">
<strong>NOTE</strong>: Attachments will be purged where any of the selected
rules below match (using an OR match).
<strong>NOTE</strong>: Attachments will be purged where ANY of the selected
rules below match.
</div>

<fieldset class="group">
<legend><span>Maximum days old</span></legend>
<div class="checkbox">
<legend><span>Maximum days old</span></legend>
<input class="checkbox" type="checkbox" id="ageRuleEnabled" name="ageRuleEnabled" value="true"
#if ($ageRuleEnabled) checked="checked" #end
/>
<label for="ageRuleEnabled">Enable</label>
<div class="description">
Purges attachments which are greater than the provided limit in days.
</div>
</div>
<div class="description">
Purges attachments which are greater than the provided limit in days.
</div>
<div class="field-group">
<label for="maxDaysOld">Maximum days old</label>
Expand All @@ -28,15 +28,15 @@
</fieldset>

<fieldset class="group">
<legend><span>Version Limit</span></legend>
<div class="checkbox">
<legend><span>Version Limit</span></legend>
<input class="checkbox" type="checkbox" id="revisionCountRuleEnabled" name="revisionCountRuleEnabled" value="true"
#if ($revisionCountRuleEnabled) checked="checked" #end
/>
<label for="revisionCountRuleEnabled">Enable</label>
<div class="description">
Purges attachments who exceed the total count of prior versions.
</div>
</div>
<div class="description">
Purges attachments who exceed the total count of prior versions.
</div>
<div class="field-group">
<label for="maxRevisions">Maximum prior versions</label>
Expand All @@ -49,15 +49,15 @@
</fieldset>

<fieldset class="group">
<legend><span>Maximum Size</span></legend>
<div class="checkbox">
<legend><span>Maximum Size</span></legend>
<input class="checkbox" type="checkbox" id="maxSizeRuleEnabled" name="maxSizeRuleEnabled" value="true"
#if ($maxSizeRuleEnabled) checked="checked" #end
/>
<label for="maxSizeRuleEnabled">Enable</label>
<div class="description">
Purges oldest where the total size of prior versions is higher than this limit.
</div>
</div>
<div class="description">
Purges oldest where the total size of prior versions is higher than this limit.
</div>
<div class="field-group">
<label for="maxTotalSize">Maximum attachment size</label>
Expand All @@ -78,15 +78,15 @@
</div>

<fieldset class="group">
<legend><span>Report Only</span></legend>
<div class="checkbox">
<legend><span>Report Only</span></legend>
<input class="checkbox" type="checkbox" id="reportOnly" name="reportOnly" value="true"
#if ($reportOnly) checked="checked" #end
/>
<label for="reportOnly">Enable Report Only Mode</label>
<div class="description">
If enabled no processing will be performed.
</div>
</div>
<div class="description">
If enabled no processing will be performed.
</div>
<div class="field-group">
<label for="reportEmailAddress">Report Address</label>
Expand All @@ -97,4 +97,3 @@
</div>
</div>
</fieldset>

4 changes: 2 additions & 2 deletions src/main/resources/templates/purge-attachments/config/configure-purge-attachments-space.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#parse ( "/template/includes/actionerrors.vm" )

<form action="doconfigure-purge-attachments-space.action" method="post" class="aui">
<form action="doconfigure-purge-attachments-space.action" method="post" class="aui long-label">
<input type="hidden" name="key" value="$space.key" />

<h2>Attachment Purging</h2>
Expand Down Expand Up @@ -59,7 +59,7 @@
<div class="buttons-container">
<div class="buttons">
<input class="button submit" type="submit" value="Save">
<a href="#">Cancel</a>
<!--<input class="button" type="submit" name="cancel" value="Cancel"/>-->
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/purge-attachments/config/configure-purge-attachments.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</head>
<body>
#parse ( "/template/includes/actionerrors.vm" )
<form action="doconfigure.action" method="POST" class="aui">
<form action="doconfigure.action" method="POST" class="aui long-label">
#parse ("/templates/purge-attachments/config/configure-purge-attachments-common.vm")

<div class="buttons-container">
<div class="buttons">
<input class="button submit" type="submit" value="Save">
<a href="#">Cancel</a>
<input class="button submit" type="submit" value="Save"/>
<!--<input class="button" type="submit" name="cancel" value="Cancel"/>-->
</div>
</div>

Expand Down

0 comments on commit 7480952

Please sign in to comment.