Skip to content

Commit 422941b

Browse files
drallgooddrallgood
committed
- Added testcases
- Fixed a few Bugs - Generic List instead of a ArrayList git-svn-id: http://zencoder-java.googlecode.com/svn/trunk@5 803c8715-f8cf-ae66-6ab9-44f18288566c
1 parent a638d54 commit 422941b

27 files changed

+1019
-121
lines changed

‎.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
55
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
66
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
7+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
88
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
99
<classpathentry kind="output" path="target/classes"/>
1010
</classpath>

‎header.txt

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright (C) ${year} ${owner} <${email}>
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

‎pom.xml

+88-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,66 @@
44
<groupId>de.bitzeche.video.transcoding</groupId>
55
<artifactId>zencoder-api</artifactId>
66
<version>0.0.1-SNAPSHOT</version>
7+
<packaging>jar</packaging>
78
<name>Zencoder API Client</name>
9+
10+
<licenses>
11+
<license>
12+
<name>The Apache Software License, Version 2.0</name>
13+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
14+
</license>
15+
</licenses>
16+
<scm>
17+
<connection>scm:svn:http://zencoder-java.googlecode.com/svn/trunk</connection>
18+
<developerConnection>scm:svn:https://zencoder-java.googlecode.com/svn/trunk</developerConnection>
19+
<url>http://zencoder-java.googlecode.com/svn/trunk</url>
20+
</scm>
21+
<organization>
22+
<name>Bitzeche GmbH</name>
23+
<url>http://www.bitzeche.de/
24+
</url>
25+
</organization>
26+
<issueManagement>
27+
<system>Google Code</system>
28+
<url>http://code.google.com/p/zencoder-java/issues/</url>
29+
</issueManagement>
30+
<developers>
31+
<developer>
32+
<id>patrice</id>
33+
<name>Patrice Brend'amour</name>
34+
<email>[email protected]</email>
35+
<roles>
36+
<role>Project Manager</role>
37+
<role>Developer</role>
38+
</roles>
39+
<url>http://www.brendamour.de</url>
40+
<organization>Bitzeche GmbH</organization>
41+
<organizationUrl>http://www.bitzeche.de/</organizationUrl>
42+
<timezone>+1</timezone>
43+
</developer>
44+
</developers>
45+
<reporting>
46+
<plugins>
47+
<plugin>
48+
<artifactId>maven-javadoc-plugin</artifactId>
49+
<version>2.6.1</version>
50+
</plugin>
51+
<plugin>
52+
<artifactId>maven-surefire-report-plugin</artifactId>
53+
<version>2.5</version>
54+
</plugin>
55+
</plugins>
56+
</reporting>
57+
<distributionManagement>
58+
<repository>
59+
<id>release</id>
60+
<url>dav:http://svn.bitzeche.de:9080/archiva/repository/release/</url>
61+
</repository>
62+
<snapshotRepository>
63+
<id>snapshots</id>
64+
<url>dav:http://svn.bitzeche.de:9080/archiva/repository/snapshots/</url>
65+
</snapshotRepository>
66+
</distributionManagement>
867
<properties>
968
<target.dir>target</target.dir>
1069
<org.slf4j.version>1.6.1</org.slf4j.version>
@@ -49,6 +108,7 @@
49108
<outputDirectory>${basedir}/${target.dir}/classes</outputDirectory>
50109
<testOutputDirectory>${basedir}/${target.dir}/test-classes</testOutputDirectory>
51110
<plugins>
111+
52112
<plugin>
53113
<groupId>org.apache.maven.plugins</groupId>
54114
<artifactId>maven-compiler-plugin</artifactId>
@@ -58,24 +118,38 @@
58118
</configuration>
59119
</plugin>
60120
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
61122
<artifactId>maven-surefire-plugin</artifactId>
123+
<version>2.4</version>
124+
</plugin>
125+
<plugin>
126+
<groupId>com.mycila.maven-license-plugin</groupId>
127+
<artifactId>maven-license-plugin</artifactId>
128+
<version>1.8.0</version>
62129
<configuration>
63-
<excludes>
64-
<exclude>**/itest/**</exclude>
65-
</excludes>
66-
<skip>false</skip>
67-
<suiteXmlFiles>
68-
<!-- this file is required during runtime, but any changes to be made
69-
MUST go into { basedir }/src/test/resources/testng.xml -->
70-
<suiteXmlFile>./target/test-classes/testng.xml</suiteXmlFile>
71-
</suiteXmlFiles>
72-
<testFailureIgnore>false</testFailureIgnore>
73-
<trimStackTrace>false</trimStackTrace>
74-
<printSummary>true</printSummary>
75-
<argLine>-Xmx1024M</argLine>
76-
<!-- <reportsDirectory>target/test-reports</reportsDirectory> -->
130+
<header>header.txt</header>
131+
<properties>
132+
<owner>Bitzeche GmbH</owner>
133+
<year>${project.inceptionYear}</year>
134+
<email>[email protected]</email>
135+
</properties>
77136
</configuration>
137+
<executions>
138+
<execution>
139+
<goals>
140+
<goal>check</goal>
141+
</goals>
142+
</execution>
143+
</executions>
78144
</plugin>
145+
79146
</plugins>
147+
<extensions>
148+
<extension>
149+
<groupId>org.apache.maven.wagon</groupId>
150+
<artifactId>wagon-webdav</artifactId>
151+
<version>1.0-beta-2</version>
152+
</extension>
153+
</extensions>
80154
</build>
81155
</project>

‎src/main/java/de/bitzeche/video/transcoding/zencoder/IZencoderClient.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package de.bitzeche.video.transcoding.zencoder;
218

319
import org.w3c.dom.Document;

‎src/main/java/de/bitzeche/video/transcoding/zencoder/ZencoderClient.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package de.bitzeche.video.transcoding.zencoder;
218

319
import java.io.StringWriter;

‎src/main/java/de/bitzeche/video/transcoding/zencoder/enums/ZencoderAspectMode.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package de.bitzeche.video.transcoding.zencoder.enums;
218

319
public enum ZencoderAspectMode {

‎src/main/java/de/bitzeche/video/transcoding/zencoder/enums/ZencoderAudioCodec.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package de.bitzeche.video.transcoding.zencoder.enums;
218

319
public enum ZencoderAudioCodec {

‎src/main/java/de/bitzeche/video/transcoding/zencoder/enums/ZencoderDeinterlace.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package de.bitzeche.video.transcoding.zencoder.enums;
218

319
public enum ZencoderDeinterlace {

‎src/main/java/de/bitzeche/video/transcoding/zencoder/enums/ZencoderRegion.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package de.bitzeche.video.transcoding.zencoder.enums;
218

319
public enum ZencoderRegion {

‎src/main/java/de/bitzeche/video/transcoding/zencoder/enums/ZencoderS3AccessControlItem.java

-37
This file was deleted.

‎src/main/java/de/bitzeche/video/transcoding/zencoder/enums/ZencoderS3AccessControlRight.java

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package de.bitzeche.video.transcoding.zencoder.enums;
18+
19+
public enum ZencoderS3AccessControlRight {
20+
READ, WRITE, FULL_CONTROL;
21+
}

‎src/main/java/de/bitzeche/video/transcoding/zencoder/enums/ZencoderVideoCodec.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright (C) ${year} Bitzeche GmbH <[email protected]>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package de.bitzeche.video.transcoding.zencoder.enums;
218

319
public enum ZencoderVideoCodec {

0 commit comments

Comments
 (0)