You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/04/10 12:00:36 UTC
camel git commit: CAMEL-10947: camel-box - Upgrade to log4j2 and fix
Karaf feature
Repository: camel
Updated Branches:
refs/heads/master ff9af958f -> 3ffa61eec
CAMEL-10947: camel-box - Upgrade to log4j2 and fix Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ffa61ee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ffa61ee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ffa61ee
Branch: refs/heads/master
Commit: 3ffa61eecaf503c16a2dc1250a8b410f3ea9adcf
Parents: ff9af95
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Mon Apr 10 20:21:29 2017 +0900
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Apr 10 13:56:36 2017 +0200
----------------------------------------------------------------------
components/camel-box/camel-box-api/pom.xml | 14 +-
.../camel-box/camel-box-component/pom.xml | 1207 +++++++++---------
.../component/box/AbstractBoxTestSupport.java | 21 +
...BoxCollaborationsManagerIntegrationTest.java | 6 -
.../box/BoxCommentsManagerIntegrationTest.java | 7 -
.../box/BoxEventsManagerIntegrationTest.java | 10 -
.../box/BoxFilesManagerIntegrationTest.java | 10 -
.../box/BoxFoldersManagerIntegrationTest.java | 12 -
.../box/BoxSearchManagerIntegrationTest.java | 10 -
.../box/BoxTasksManagerIntegrationTest.java | 9 -
.../src/test/resources/log4j.properties | 14 -
.../src/test/resources/log4j2.properties | 33 +
parent/pom.xml | 4 +-
.../features/src/main/resources/features.xml | 20 +-
.../apache/camel/itest/karaf/CamelBoxTest.java | 2 -
15 files changed, 698 insertions(+), 681 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 81719e5..cfe54bf 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -28,17 +28,19 @@
<artifactId>camel-box-api</artifactId>
<name>Camel :: Box :: API</name>
<description>Camel Box API</description>
+ <packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <camel.osgi.export.pkg>org.apache.camel.component.box.api*</camel.osgi.export.pkg>
</properties>
<build>
<defaultGoal>install</defaultGoal>
<plugins>
-
+
<!-- to generate API Javadoc -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -86,10 +88,10 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>com.box</groupId>
- <artifactId>box-java-sdk</artifactId>
- <version>2.1.1</version>
- </dependency>
+ <dependency>
+ <groupId>com.box</groupId>
+ <artifactId>box-java-sdk</artifactId>
+ <version>${box-java-sdk-version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml
index 669e01e..bf440a6 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -15,613 +15,650 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-box-parent</artifactId>
- <version>2.19.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-box-parent</artifactId>
+ <version>2.19.0-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-box</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Box :: Component</name>
- <description>Camel Box component</description>
+ <artifactId>camel-box</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Box :: Component</name>
+ <description>Camel Box component</description>
- <properties>
- <schemeName>box</schemeName>
- <componentName>Box</componentName>
- <componentPackage>org.apache.camel.component.box</componentPackage>
- <outPackage>org.apache.camel.component.box.internal</outPackage>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
+ <properties>
+ <schemeName>box</schemeName>
+ <componentName>Box</componentName>
+ <componentPackage>org.apache.camel.component.box</componentPackage>
+ <outPackage>org.apache.camel.component.box.internal</outPackage>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-box-api</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-box-api</artifactId>
+ </dependency>
- <dependency>
- <groupId>com.box</groupId>
- <artifactId>box-java-sdk</artifactId>
- <version>${box-java-sdk-version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.box</groupId>
+ <artifactId>box-java-sdk</artifactId>
+ <version>${box-java-sdk-version}</version>
+ </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>${htmlunit.version}</version>
- </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>${htmlunit-version}</version>
+ </dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
+ <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>spi-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <!-- Component API javadoc in provided scope to read API signatures -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-box-api</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- <scope>provided</scope>
- </dependency>
+ <!-- Component API javadoc in provided scope to read API signatures -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-box-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <scope>provided</scope>
+ </dependency>
- <!-- Component API javadoc in provided scope to read API signatures -->
- <dependency>
- <groupId>com.box</groupId>
- <artifactId>box-java-sdk</artifactId>
+ <!-- Component API javadoc in provided scope to read API signatures -->
+ <dependency>
+ <groupId>com.box</groupId>
+ <artifactId>box-java-sdk</artifactId>
<version>${box-java-sdk-version}</version>
- <classifier>javadoc</classifier>
- <scope>provided</scope>
- </dependency>
+ <classifier>javadoc</classifier>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
+ <scope>test</scope>
+ </dependency>
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <build>
+ <defaultGoal>install</defaultGoal>
- <build>
- <defaultGoal>install</defaultGoal>
+ <plugins>
- <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-api-component-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-component-classes</id>
+ <goals>
+ <goal>fromApis</goal>
+ </goals>
+ <configuration>
+ <apis>
+ <api>
+ <apiName>collaborations</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxCollaborationsManager</proxyClass>
+ <fromJavadoc />
+ <aliases>
+ <alias>
+ <methodPattern>addFolderCollaboration</methodPattern>
+ <methodAlias>add</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>addFolderCollaborationByEmail</methodPattern>
+ <methodAlias>addByEmail</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteCollaboration</methodPattern>
+ <methodAlias>delete</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFolderCollaborations</methodPattern>
+ <methodAlias>collaborations</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getPendingCollaborations</methodPattern>
+ <methodAlias>pendingCollaborations</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getCollaborationInfo</methodPattern>
+ <methodAlias>info</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>updateCollaborationInfo</methodPattern>
+ <methodAlias>updateInfo</methodAlias>
+ </alias>
+ </aliases>
+ </api>
+ <api>
+ <apiName>comments</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxCommentsManager</proxyClass>
+ <fromJavadoc />
+ <aliases>
+ <alias>
+ <methodPattern>addFileComment</methodPattern>
+ <methodAlias>add</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>changeCommentMessage</methodPattern>
+ <methodAlias>updateMessage</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteComment</methodPattern>
+ <methodAlias>delete</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getCommentInfo</methodPattern>
+ <methodAlias>info</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFileComments</methodPattern>
+ <methodAlias>comments</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>replyToComment</methodPattern>
+ <methodAlias>reply</methodAlias>
+ </alias>
+ </aliases>
+ </api>
+ <api>
+ <apiName>event-logs</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxEventLogsManager</proxyClass>
+ <fromJavadoc />
+ <aliases>
+ <alias>
+ <methodPattern>getEnterpriseEvents</methodPattern>
+ <methodAlias>events</methodAlias>
+ </alias>
+ </aliases>
+ <nullableOptions>
+ <nullableOption>position</nullableOption>
+ <nullableOption>types</nullableOption>
+ </nullableOptions>
+ </api>
+ <api>
+ <apiName>files</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxFilesManager</proxyClass>
+ <fromJavadoc />
+ <aliases>
+ <alias>
+ <methodPattern>uploadFile</methodPattern>
+ <methodAlias>upload</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>downloadFile</methodPattern>
+ <methodAlias>download</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>copyFile</methodPattern>
+ <methodAlias>copy</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>moveFile</methodPattern>
+ <methodAlias>move</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>renameFile</methodPattern>
+ <methodAlias>rename</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>createFileSharedLink</methodPattern>
+ <methodAlias>link</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteFile</methodPattern>
+ <methodAlias>delete</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>uploadNewFileVersion</methodPattern>
+ <methodAlias>uploadVersion</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>promoteFileVersion</methodPattern>
+ <methodAlias>promoteVersion</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFileVersions</methodPattern>
+ <methodAlias>versions</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>downloadPreviousFileVersions</methodPattern>
+ <methodAlias>downloadVersion</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteFileVersion</methodPattern>
+ <methodAlias>deleteVersion</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFileInfo</methodPattern>
+ <methodAlias>info</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>updateFileInfo</methodPattern>
+ <methodAlias>updateInfo</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>createFileMetadata</methodPattern>
+ <methodAlias>createMetadata</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFileMetadata</methodPattern>
+ <methodAlias>metadata</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>updateFileMetadata</methodPattern>
+ <methodAlias>updateMetadata</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteFileMetadata</methodPattern>
+ <methodAlias>deleteMetadata</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getDownloadUrl</methodPattern>
+ <methodAlias>url</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getPreviewLink</methodPattern>
+ <methodAlias>preview</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFileThumbnail</methodPattern>
+ <methodAlias>thumbnail</methodAlias>
+ </alias>
+ </aliases>
+ <nullableOptions>
+ <nullableOption>fields</nullableOption>
+ <nullableOption>created</nullableOption>
+ <nullableOption>modified</nullableOption>
+ <nullableOption>size</nullableOption>
+ <nullableOption>fileSize</nullableOption>
+ <nullableOption>rangeStart</nullableOption>
+ <nullableOption>rangeEnd</nullableOption>
+ <nullableOption>listener</nullableOption>
+ <nullableOption>fileSize</nullableOption>
+ <nullableOption>newName</nullableOption>
+ <nullableOption>unshareDate</nullableOption>
+ <nullableOption>permissions</nullableOption>
+ <nullableOption>typeName</nullableOption>
+ </nullableOptions>
+ </api>
+ <api>
+ <apiName>folders</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxFoldersManager</proxyClass>
+ <fromJavadoc>
+ </fromJavadoc>
+ <aliases>
+ <alias>
+ <methodPattern>getRootFolder</methodPattern>
+ <methodAlias>root</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>createFolder</methodPattern>
+ <methodAlias>create</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>copyFolder</methodPattern>
+ <methodAlias>copy</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>moveFolder</methodPattern>
+ <methodAlias>move</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>renameFolder</methodPattern>
+ <methodAlias>rename</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>createFolderSharedLink</methodPattern>
+ <methodAlias>link</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteFolder</methodPattern>
+ <methodAlias>delete</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFolder</methodPattern>
+ <methodAlias>folder</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFolderInfo</methodPattern>
+ <methodAlias>info</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFolderItems</methodPattern>
+ <methodAlias>items</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>updateFolderInfo</methodPattern>
+ <methodAlias>updateInfo</methodAlias>
+ </alias>
+ </aliases>
+ <nullableOptions>
+ <nullableOption>offset</nullableOption>
+ <nullableOption>limit</nullableOption>
+ <nullableOption>fields</nullableOption>
+ </nullableOptions>
+ </api>
+ <api>
+ <apiName>groups</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxGroupsManager</proxyClass>
+ <fromJavadoc>
+ </fromJavadoc>
+ <aliases>
+ <alias>
+ <methodPattern>createGroup</methodPattern>
+ <methodAlias>create</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteGroup</methodPattern>
+ <methodAlias>delete</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getAllGroups</methodPattern>
+ <methodAlias>groups</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getGroupInfo</methodPattern>
+ <methodAlias>info</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>addGroupMembership</methodPattern>
+ <methodAlias>addMembership</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteGroupMembership</methodPattern>
+ <methodAlias>deleteMembership</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getGroupMemberships</methodPattern>
+ <methodAlias>memberships</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getGroupMembershipInfo</methodPattern>
+ <methodAlias>membershipInfo</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>updateGroupMembershipInfo</methodPattern>
+ <methodAlias>updateMembershipInfo</methodAlias>
+ </alias>
+ </aliases>
+ <nullableOptions>
+ <nullableOption>role</nullableOption>
+ </nullableOptions>
+ </api>
+ <api>
+ <apiName>events</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxEventsManager</proxyClass>
+ <fromJavadoc>
+ <excludeMethods>stopListening</excludeMethods>
+ </fromJavadoc>
+ <excludeConfigNames>listener</excludeConfigNames>
+ <nullableOptions>
+ <nullableOption>startingPosition</nullableOption>
+ </nullableOptions>
+ </api>
+ <api>
+ <apiName>search</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxSearchManager</proxyClass>
+ <fromJavadoc />
+ <aliases>
+ <alias>
+ <methodPattern>searchFolder</methodPattern>
+ <methodAlias>search</methodAlias>
+ </alias>
+ </aliases>
+ </api>
+ <api>
+ <apiName>tasks</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxTasksManager</proxyClass>
+ <fromJavadoc>
+ </fromJavadoc>
+ <aliases>
+ <alias>
+ <methodPattern>addFileTask</methodPattern>
+ <methodAlias>add</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteTask</methodPattern>
+ <methodAlias>delete</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getFileTasks</methodPattern>
+ <methodAlias>tasks</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getTaskInfo</methodPattern>
+ <methodAlias>info</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>updateTaskInfo</methodPattern>
+ <methodAlias>updateInfo</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>addAssignmentToTask</methodPattern>
+ <methodAlias>addAssignment</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteTaskAssignment</methodPattern>
+ <methodAlias>deleteAssignment</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getTaskAssignments</methodPattern>
+ <methodAlias>assignments</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getTaskAssignmentInfo</methodPattern>
+ <methodAlias>assignmentInfo</methodAlias>
+ </alias>
+ </aliases>
+ <nullableOptions>
+ <nullableOption>message</nullableOption>
+ </nullableOptions>
+ </api>
+ <api>
+ <apiName>users</apiName>
+ <proxyClass>org.apache.camel.component.box.api.BoxUsersManager</proxyClass>
+ <fromJavadoc />
+ <aliases>
+ <alias>
+ <methodPattern>getCurrentUser</methodPattern>
+ <methodAlias>currentUser</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getAllEnterpriseOrExternalUsers</methodPattern>
+ <methodAlias>users</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>createAppUser</methodPattern>
+ <methodAlias>create</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>createEnterpriseUser</methodPattern>
+ <methodAlias>create</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteUser</methodPattern>
+ <methodAlias>delete</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>addUserEmailAlias</methodPattern>
+ <methodAlias>addEmailAlias</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getUserEmailAlias</methodPattern>
+ <methodAlias>emailAlias</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>deleteUserEmailAlias</methodPattern>
+ <methodAlias>deleteEmailAlias</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>getUserInfo</methodPattern>
+ <methodAlias>info</methodAlias>
+ </alias>
+ <alias>
+ <methodPattern>updateUserInfo</methodPattern>
+ <methodAlias>updateInfo</methodAlias>
+ </alias>
+ </aliases>
+ <nullableOptions>
+ <nullableOption>filterTerm</nullableOption>
+ <nullableOption>fields</nullableOption>
+ <nullableOption>params</nullableOption>
+ </nullableOptions>
+ </api>
+ </apis>
+ <!-- Specify global values for all APIs here, these are overridden at API level
+ <substitutions/>
+ <excludeConfigNames/>
+ <excludeConfigTypes/>
+ <extraOptions>
+ <fromJavadoc/>
+ <aliases/> -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-api-component-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-component-classes</id>
- <goals>
- <goal>fromApis</goal>
- </goals>
- <configuration>
- <apis>
- <api>
- <apiName>collaborations</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxCollaborationsManager</proxyClass>
- <fromJavadoc />
- <aliases>
- <alias>
- <methodPattern>addFolderCollaboration</methodPattern>
- <methodAlias>add</methodAlias>
- </alias>
- <alias>
- <methodPattern>addFolderCollaborationByEmail</methodPattern>
- <methodAlias>addByEmail</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteCollaboration</methodPattern>
- <methodAlias>delete</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFolderCollaborations</methodPattern>
- <methodAlias>collaborations</methodAlias>
- </alias>
- <alias>
- <methodPattern>getPendingCollaborations</methodPattern>
- <methodAlias>pendingCollaborations</methodAlias>
- </alias>
- <alias>
- <methodPattern>getCollaborationInfo</methodPattern>
- <methodAlias>info</methodAlias>
- </alias>
- <alias>
- <methodPattern>updateCollaborationInfo</methodPattern>
- <methodAlias>updateInfo</methodAlias>
- </alias>
- </aliases>
- </api>
- <api>
- <apiName>comments</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxCommentsManager</proxyClass>
- <fromJavadoc />
- <aliases>
- <alias>
- <methodPattern>addFileComment</methodPattern>
- <methodAlias>add</methodAlias>
- </alias>
- <alias>
- <methodPattern>changeCommentMessage</methodPattern>
- <methodAlias>updateMessage</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteComment</methodPattern>
- <methodAlias>delete</methodAlias>
- </alias>
- <alias>
- <methodPattern>getCommentInfo</methodPattern>
- <methodAlias>info</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFileComments</methodPattern>
- <methodAlias>comments</methodAlias>
- </alias>
- <alias>
- <methodPattern>replyToComment</methodPattern>
- <methodAlias>reply</methodAlias>
- </alias>
- </aliases>
- </api>
- <api>
- <apiName>event-logs</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxEventLogsManager</proxyClass>
- <fromJavadoc />
- <aliases>
- <alias>
- <methodPattern>getEnterpriseEvents</methodPattern>
- <methodAlias>events</methodAlias>
- </alias>
- </aliases>
- <nullableOptions>
- <nullableOption>position</nullableOption>
- <nullableOption>types</nullableOption>
- </nullableOptions>
- </api>
- <api>
- <apiName>files</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxFilesManager</proxyClass>
- <fromJavadoc />
- <aliases>
- <alias>
- <methodPattern>uploadFile</methodPattern>
- <methodAlias>upload</methodAlias>
- </alias>
- <alias>
- <methodPattern>downloadFile</methodPattern>
- <methodAlias>download</methodAlias>
- </alias>
- <alias>
- <methodPattern>copyFile</methodPattern>
- <methodAlias>copy</methodAlias>
- </alias>
- <alias>
- <methodPattern>moveFile</methodPattern>
- <methodAlias>move</methodAlias>
- </alias>
- <alias>
- <methodPattern>renameFile</methodPattern>
- <methodAlias>rename</methodAlias>
- </alias>
- <alias>
- <methodPattern>createFileSharedLink</methodPattern>
- <methodAlias>link</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteFile</methodPattern>
- <methodAlias>delete</methodAlias>
- </alias>
- <alias>
- <methodPattern>uploadNewFileVersion</methodPattern>
- <methodAlias>uploadVersion</methodAlias>
- </alias>
- <alias>
- <methodPattern>promoteFileVersion</methodPattern>
- <methodAlias>promoteVersion</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFileVersions</methodPattern>
- <methodAlias>versions</methodAlias>
- </alias>
- <alias>
- <methodPattern>downloadPreviousFileVersions</methodPattern>
- <methodAlias>downloadVersion</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteFileVersion</methodPattern>
- <methodAlias>deleteVersion</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFileInfo</methodPattern>
- <methodAlias>info</methodAlias>
- </alias>
- <alias>
- <methodPattern>updateFileInfo</methodPattern>
- <methodAlias>updateInfo</methodAlias>
- </alias>
- <alias>
- <methodPattern>createFileMetadata</methodPattern>
- <methodAlias>createMetadata</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFileMetadata</methodPattern>
- <methodAlias>metadata</methodAlias>
- </alias>
- <alias>
- <methodPattern>updateFileMetadata</methodPattern>
- <methodAlias>updateMetadata</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteFileMetadata</methodPattern>
- <methodAlias>deleteMetadata</methodAlias>
- </alias>
- <alias>
- <methodPattern>getDownloadUrl</methodPattern>
- <methodAlias>url</methodAlias>
- </alias>
- <alias>
- <methodPattern>getPreviewLink</methodPattern>
- <methodAlias>preview</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFileThumbnail</methodPattern>
- <methodAlias>thumbnail</methodAlias>
- </alias>
- </aliases>
- <nullableOptions>
- <nullableOption>fields</nullableOption>
- <nullableOption>created</nullableOption>
- <nullableOption>modified</nullableOption>
- <nullableOption>size</nullableOption>
- <nullableOption>fileSize</nullableOption>
- <nullableOption>rangeStart</nullableOption>
- <nullableOption>rangeEnd</nullableOption>
- <nullableOption>listener</nullableOption>
- <nullableOption>fileSize</nullableOption>
- <nullableOption>newName</nullableOption>
- <nullableOption>unshareDate</nullableOption>
- <nullableOption>permissions</nullableOption>
- <nullableOption>typeName</nullableOption>
- </nullableOptions>
- </api>
- <api>
- <apiName>folders</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxFoldersManager</proxyClass>
- <fromJavadoc>
- </fromJavadoc>
- <aliases>
- <alias>
- <methodPattern>getRootFolder</methodPattern>
- <methodAlias>root</methodAlias>
- </alias>
- <alias>
- <methodPattern>createFolder</methodPattern>
- <methodAlias>create</methodAlias>
- </alias>
- <alias>
- <methodPattern>copyFolder</methodPattern>
- <methodAlias>copy</methodAlias>
- </alias>
- <alias>
- <methodPattern>moveFolder</methodPattern>
- <methodAlias>move</methodAlias>
- </alias>
- <alias>
- <methodPattern>renameFolder</methodPattern>
- <methodAlias>rename</methodAlias>
- </alias>
- <alias>
- <methodPattern>createFolderSharedLink</methodPattern>
- <methodAlias>link</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteFolder</methodPattern>
- <methodAlias>delete</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFolder</methodPattern>
- <methodAlias>folder</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFolderInfo</methodPattern>
- <methodAlias>info</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFolderItems</methodPattern>
- <methodAlias>items</methodAlias>
- </alias>
- <alias>
- <methodPattern>updateFolderInfo</methodPattern>
- <methodAlias>updateInfo</methodAlias>
- </alias>
- </aliases>
- <nullableOptions>
- <nullableOption>offset</nullableOption>
- <nullableOption>limit</nullableOption>
- <nullableOption>fields</nullableOption>
- </nullableOptions>
- </api>
- <api>
- <apiName>groups</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxGroupsManager</proxyClass>
- <fromJavadoc>
- </fromJavadoc>
- <aliases>
- <alias>
- <methodPattern>createGroup</methodPattern>
- <methodAlias>create</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteGroup</methodPattern>
- <methodAlias>delete</methodAlias>
- </alias>
- <alias>
- <methodPattern>getAllGroups</methodPattern>
- <methodAlias>groups</methodAlias>
- </alias>
- <alias>
- <methodPattern>getGroupInfo</methodPattern>
- <methodAlias>info</methodAlias>
- </alias>
- <alias>
- <methodPattern>addGroupMembership</methodPattern>
- <methodAlias>addMembership</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteGroupMembership</methodPattern>
- <methodAlias>deleteMembership</methodAlias>
- </alias>
- <alias>
- <methodPattern>getGroupMemberships</methodPattern>
- <methodAlias>memberships</methodAlias>
- </alias>
- <alias>
- <methodPattern>getGroupMembershipInfo</methodPattern>
- <methodAlias>membershipInfo</methodAlias>
- </alias>
- <alias>
- <methodPattern>updateGroupMembershipInfo</methodPattern>
- <methodAlias>updateMembershipInfo</methodAlias>
- </alias>
- </aliases>
- <nullableOptions>
- <nullableOption>role</nullableOption>
- </nullableOptions>
- </api>
- <api>
- <apiName>events</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxEventsManager</proxyClass>
- <fromJavadoc>
- <excludeMethods>stopListening</excludeMethods>
- </fromJavadoc>
- <excludeConfigNames>listener</excludeConfigNames>
- <nullableOptions>
- <nullableOption>startingPosition</nullableOption>
- </nullableOptions>
- </api>
- <api>
- <apiName>search</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxSearchManager</proxyClass>
- <fromJavadoc/>
- <aliases>
- <alias>
- <methodPattern>searchFolder</methodPattern>
- <methodAlias>search</methodAlias>
- </alias>
- </aliases>
- </api>
- <api>
- <apiName>tasks</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxTasksManager</proxyClass>
- <fromJavadoc>
- </fromJavadoc>
- <aliases>
- <alias>
- <methodPattern>addFileTask</methodPattern>
- <methodAlias>add</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteTask</methodPattern>
- <methodAlias>delete</methodAlias>
- </alias>
- <alias>
- <methodPattern>getFileTasks</methodPattern>
- <methodAlias>tasks</methodAlias>
- </alias>
- <alias>
- <methodPattern>getTaskInfo</methodPattern>
- <methodAlias>info</methodAlias>
- </alias>
- <alias>
- <methodPattern>updateTaskInfo</methodPattern>
- <methodAlias>updateInfo</methodAlias>
- </alias>
- <alias>
- <methodPattern>addAssignmentToTask</methodPattern>
- <methodAlias>addAssignment</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteTaskAssignment</methodPattern>
- <methodAlias>deleteAssignment</methodAlias>
- </alias>
- <alias>
- <methodPattern>getTaskAssignments</methodPattern>
- <methodAlias>assignments</methodAlias>
- </alias>
- <alias>
- <methodPattern>getTaskAssignmentInfo</methodPattern>
- <methodAlias>assignmentInfo</methodAlias>
- </alias>
- </aliases>
- <nullableOptions>
- <nullableOption>message</nullableOption>
- </nullableOptions>
- </api>
- <api>
- <apiName>users</apiName>
- <proxyClass>org.apache.camel.component.box.api.BoxUsersManager</proxyClass>
- <fromJavadoc/>
- <aliases>
- <alias>
- <methodPattern>getCurrentUser</methodPattern>
- <methodAlias>currentUser</methodAlias>
- </alias>
- <alias>
- <methodPattern>getAllEnterpriseOrExternalUsers</methodPattern>
- <methodAlias>users</methodAlias>
- </alias>
- <alias>
- <methodPattern>createAppUser</methodPattern>
- <methodAlias>create</methodAlias>
- </alias>
- <alias>
- <methodPattern>createEnterpriseUser</methodPattern>
- <methodAlias>create</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteUser</methodPattern>
- <methodAlias>delete</methodAlias>
- </alias>
- <alias>
- <methodPattern>addUserEmailAlias</methodPattern>
- <methodAlias>addEmailAlias</methodAlias>
- </alias>
- <alias>
- <methodPattern>getUserEmailAlias</methodPattern>
- <methodAlias>emailAlias</methodAlias>
- </alias>
- <alias>
- <methodPattern>deleteUserEmailAlias</methodPattern>
- <methodAlias>deleteEmailAlias</methodAlias>
- </alias>
- <alias>
- <methodPattern>getUserInfo</methodPattern>
- <methodAlias>info</methodAlias>
- </alias>
- <alias>
- <methodPattern>updateUserInfo</methodPattern>
- <methodAlias>updateInfo</methodAlias>
- </alias>
- </aliases>
- <nullableOptions>
- <nullableOption>filterTerm</nullableOption>
- <nullableOption>fields</nullableOption>
- <nullableOption>params</nullableOption>
- </nullableOptions>
- </api>
- </apis>
- <!-- Specify global values for all APIs here, these are overridden
- at API level <substitutions/> <excludeConfigNames/> <excludeConfigTypes/>
- <extraOptions> <fromJavadoc/> <aliases/> -->
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <!-- add generated source and test source to build -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-generated-sources</id>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/camel-component</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-generated-test-sources</id>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-test-sources/camel-component</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <!-- add generated source and test source to build -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-generated-sources</id>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/camel-component</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-generated-test-sources</id>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-test-sources/camel-component</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </plugins>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-api-component-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <scheme>${schemeName}</scheme>
+ <componentName>${componentName}</componentName>
+ <componentPackage>${componentPackage}</componentPackage>
+ <outPackage>${outPackage}</outPackage>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-api-component-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <scheme>${schemeName}</scheme>
- <componentName>${componentName}</componentName>
- <componentPackage>${componentPackage}</componentPackage>
- <outPackage>${outPackage}</outPackage>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ </build>
- </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-api-component-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <scheme>${schemeName}</scheme>
+ <componentName>${componentName}</componentName>
+ <componentPackage>${componentPackage}</componentPackage>
+ <outPackage>${outPackage}</outPackage>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-api-component-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <scheme>${schemeName}</scheme>
- <componentName>${componentName}</componentName>
- <componentPackage>${componentPackage}</componentPackage>
- <outPackage>${outPackage}</outPackage>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <profiles>
+ <profile>
+ <id>integration</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <failIfNoTests>false</failIfNoTests>
+ <runOrder>alphabetical</runOrder>
+ <includes>
+ <include>**/*IntegrationTest.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*XXXTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
index 6d87573..ecee8e9 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import com.box.sdk.BoxFile;
+import com.box.sdk.BoxFolder;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -33,6 +35,9 @@ public class AbstractBoxTestSupport extends CamelTestSupport {
private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
+ protected BoxFolder testFolder;
+ protected BoxFile testFile;
+
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -79,4 +84,20 @@ public class AbstractBoxTestSupport extends CamelTestSupport {
protected <T> T requestBody(String endpoint, Object body) throws CamelExecutionException {
return (T) template().requestBody(endpoint, body);
}
+
+ protected void deleteTestFolder() {
+ try {
+ testFolder.delete(true);
+ } catch (Throwable t) {
+ }
+ testFolder = null;
+ }
+
+ protected void deleteTestFile() {
+ try {
+ testFile.delete();
+ } catch (Throwable t) {
+ }
+ testFile = null;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
index 31a0756..6146227 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
@@ -50,7 +50,6 @@ public class BoxCollaborationsManagerIntegrationTest extends AbstractBoxTestSupp
private static final String CAMEL_TEST_COLLABORATOR_EMAIL = "cameltest@example.com";
private static final String CAMEL_TEST_COLLABORATOR_NAME = "cameltest";
- private BoxFolder testFolder;
private BoxCollaboration testCollaboration;
@Test
@@ -212,11 +211,6 @@ public class BoxCollaborationsManagerIntegrationTest extends AbstractBoxTestSupp
testFolder = rootFolder.createFolder(CAMEL_TEST_FOLDER).getResource();
}
- private void deleteTestFolder() {
- testFolder.delete(true);
- testFolder = null;
- }
-
private void createTestCollaborator() {
testCollaboration = testFolder.collaborate(CAMEL_TEST_COLLABORATOR_EMAIL, BoxCollaboration.Role.EDITOR)
.getResource();
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
index 8f9e050..38f5467 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
@@ -52,8 +52,6 @@ public class BoxCommentsManagerIntegrationTest extends AbstractBoxTestSupport {
private static final String CAMEL_TEST_FILE_CHANGED_COMMENT = "CamelTestFile changed comment.";
private static final String CAMEL_TEST_FILE_REPLY_COMMENT = "CamelTestFile changed comment.";
- private BoxFile testFile;
-
@Test
public void testAddFileComment() throws Exception {
final Map<String, Object> headers = new HashMap<String, Object>();
@@ -194,9 +192,4 @@ public class BoxCommentsManagerIntegrationTest extends AbstractBoxTestSupport {
testFile = rootFolder.uploadFile(stream, CAMEL_TEST_FILE_NAME).getResource();
}
- private void deleteTestFile() {
- testFile.delete();
- testFile = null;
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
index fb18624..ce2b706 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
@@ -49,8 +49,6 @@ public class BoxEventsManagerIntegrationTest extends AbstractBoxTestSupport {
private static final String CAMEL_TEST_FILE = "/CamelTestFile.txt";
private static final String CAMEL_TEST_FILE_NAME = "CamelTestFile.txt";
- private BoxFile testFile;
-
@Test
public void testListen() throws Exception {
try {
@@ -95,12 +93,4 @@ public class BoxEventsManagerIntegrationTest extends AbstractBoxTestSupport {
InputStream stream = getClass().getResourceAsStream(CAMEL_TEST_FILE);
testFile = rootFolder.uploadFile(stream, CAMEL_TEST_FILE_NAME).getResource();
}
-
- private void deleteTestFile() {
- try {
- testFile.delete();
- } catch (Throwable t) {
- }
- testFile = null;
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
index 349e8b1..60bbb94 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
@@ -61,8 +61,6 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
private static final String CAMEL_TEST_RENAME_FILE_NAME = "CamelTestFile_Rename.txt";
private static final String CAMEL_TEST_UPLOAD_FILE_NAME = "CamelTestFile_Upload.txt";
- private BoxFile testFile;
-
@Test
public void testCopyFile() throws Exception {
com.box.sdk.BoxFile result = null;
@@ -552,14 +550,6 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
testFile = rootFolder.uploadFile(stream, CAMEL_TEST_FILE_NAME).getResource();
}
- private void deleteTestFile() {
- try {
- testFile.delete();
- } catch (Throwable t) {
- }
- testFile = null;
- }
-
private int sizeOfIterable(Iterable<?> it) {
if (it instanceof Collection) {
return ((Collection<?>) it).size();
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
index 7dcea18..8da867a 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
@@ -53,8 +53,6 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
private static final String CAMEL_TEST_ROOT_FOLDER_ID = "0";
private static final String CAMEL_TEST_DESTINATION_FOLDER_ID = "0";
- private BoxFolder testFolder;
-
@Test
public void testCreateFolder() throws Exception {
@@ -296,16 +294,6 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
testFolder = rootFolder.createFolder(CAMEL_TEST_FOLDER).getResource();
}
- private void deleteTestFolder() {
- if (testFolder != null) {
- try {
- testFolder.delete(true);
- } catch (Throwable t) {
- }
- testFolder = null;
- }
- }
-
private int sizeOfIterable(Iterable<?> it) {
if (it instanceof Collection) {
return ((Collection<?>) it).size();
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
index 16d5aed..93f56b9 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
@@ -47,8 +47,6 @@ public class BoxSearchManagerIntegrationTest extends AbstractBoxTestSupport {
private static final String CAMEL_TEST_FILE = "/CamelTestFile.txt";
private static final String CAMEL_TEST_FILE_NAME = "CamelTestFile.txt";
- private BoxFile testFile;
-
@Test
public void testSearchFolder() throws Exception {
final Map<String, Object> headers = new HashMap<String, Object>();
@@ -96,12 +94,4 @@ public class BoxSearchManagerIntegrationTest extends AbstractBoxTestSupport {
InputStream stream = getClass().getResourceAsStream(CAMEL_TEST_FILE);
testFile = rootFolder.uploadFile(stream, CAMEL_TEST_FILE_NAME).getResource();
}
-
- private void deleteTestFile() {
- try {
- testFile.delete();
- } catch (Throwable t) {
- }
- testFile = null;
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
index 0f6a10b..4a2cc82 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
@@ -56,7 +56,6 @@ public class BoxTasksManagerIntegrationTest extends AbstractBoxTestSupport {
private static final String CAMEL_TEST_MESSAGE = "Camel Test Message";
private static final long TEN_MINUTES_IN_MILLIS = 600000;
- private BoxFile testFile;
private BoxTask testTask;
@Test
@@ -271,14 +270,6 @@ public class BoxTasksManagerIntegrationTest extends AbstractBoxTestSupport {
testFile = rootFolder.uploadFile(stream, CAMEL_TEST_FILE_NAME).getResource();
}
- private void deleteTestFile() {
- try {
- testFile.delete();
- } catch (Throwable t) {
- }
- testFile = null;
- }
-
private BoxUser getCurrentUser() {
return BoxUser.getCurrentUser(getConnection());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/resources/log4j.properties b/components/camel-box/camel-box-component/src/test/resources/log4j.properties
deleted file mode 100644
index 3b1bd38..0000000
--- a/components/camel-box/camel-box-component/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# The logging properties used
-#
-log4j.rootLogger=INFO, out
-
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/components/camel-box/camel-box-component/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/test/resources/log4j2.properties b/components/camel-box/camel-box-component/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..18c2933
--- /dev/null
+++ b/components/camel-box/camel-box-component/src/test/resources/log4j2.properties
@@ -0,0 +1,33 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-box-component-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# uncomment the following line to turn on Camel debugging
+#logger.camel.name = org.apache.camel
+#logger.camel.level =DEBUG
+
+rootLogger.level = INFO
+rootLogger.appenderRef.out.ref = out
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8390d50..744022e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -267,8 +267,9 @@
<hk2-version>2.3.0</hk2-version>
<hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
<hsqldb-version>2.3.4</hsqldb-version>
- <htmlunit.version>2.24</htmlunit.version>
+ <htmlunit-version>2.24</htmlunit-version>
<htmlunit-bundle-version>2.24_1</htmlunit-bundle-version>
+ <htmlunit-core-js-version>2.23</htmlunit-core-js-version>
<htrace-version>3.1.0-incubating</htrace-version>
<httpunit-version>1.7</httpunit-version>
<httpcore4-version>4.4.6</httpcore4-version>
@@ -471,6 +472,7 @@
<mybatis-version>3.4.2</mybatis-version>
<narayana-version>5.5.3.Final</narayana-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
+ <nekohtml-version>1.9.22</nekohtml-version>
<netty3-version>3.10.6.Final</netty3-version>
<netty-version>4.1.9.Final</netty-version>
<netty40-version>4.0.45.Final</netty40-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index cdbe42b..6b0c5bb5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -222,29 +222,31 @@
<feature name='camel-box' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>jetty</feature>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-api/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-common/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-client/${jetty-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
- <!-- we need commons lang 2.x and 3.x -->
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle dependency='true'>wrap:mvn:net.box/boxjavalibv2/${boxjavalibv2.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.htmlunit/${htmlunit-bundle-version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.18</bundle>
<bundle dependency='true'>wrap:mvn:org.w3c.css/sac/1.3</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.22</bundle>
- <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/neko-htmlunit/2.21</bundle>
- <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/2.17</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/${nekohtml-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/neko-htmlunit/${htmlunit-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/${htmlunit-core-js-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.box/box-java-sdk/${box-java-sdk-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-box-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-box/${project.version}</bundle>
</feature>
<feature name='camel-braintree' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1176,9 +1178,9 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.22</bundle>
- <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/neko-htmlunit/2.21</bundle>
- <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/2.17</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/${nekohtml-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/neko-htmlunit/${htmlunit-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/${htmlunit-core-js-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ffa61ee/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
index 9831247..eb29b8d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.itest.karaf;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -27,7 +26,6 @@ public class CamelBoxTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelBoxTest.class);
@Test
- @Ignore("CAMEL-10999 Karaf camel-box feature is not updated with new Box 2 SDK")
public void test() throws Exception {
testComponent(COMPONENT);
}