You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2014/12/21 20:28:55 UTC
svn commit: r1647196 - in
/directory/studio/branches/studio-tycho/plugins/ldapbrowser.core:
pom-first.xml pom.xml
src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
Author: seelmann
Date: Sun Dec 21 19:28:55 2014
New Revision: 1647196
URL: http://svn.apache.org/r1647196
Log:
Add embedded artifacts. Remove references to odfdom, it is no longer available in maven central
Modified:
directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom-first.xml
directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom.xml
directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
Modified: directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom-first.xml?rev=1647196&r1=1647195&r2=1647196&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom-first.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom-first.xml Sun Dec 21 19:28:55 2014
@@ -42,8 +42,51 @@
</dependencies>
<build>
- <!-- MANIFEST.MF Generation -->
<plugins>
+ <!-- Embedded artifacts -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-embedded-libs</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>lib</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.9</version>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.openoffice</groupId>
+ <artifactId>odfdom</artifactId>
+ <version>0.6.16</version>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.11.0</version>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- MANIFEST.MF Generation -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -86,6 +129,11 @@
org.apache.directory.studio.common.core,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.ldifparser</Require-Bundle>
+
+ <Embed-Directory>lib</Embed-Directory>
+ <Embedded-Artifacts>lib/poi-3.9.jar;g="org.apache.poi";a="poi";v="3.9"</Embedded-Artifacts>
+ <Bundle-ClassPath>.,
+ lib/poi-3.9.jar</Bundle-ClassPath>
</instructions>
</configuration>
<executions>
Modified: directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom.xml?rev=1647196&r1=1647195&r2=1647196&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/pom.xml Sun Dec 21 19:28:55 2014
@@ -53,24 +53,6 @@
<artifactId>poi</artifactId>
<version>3.9</version>
</artifactItem>
-
- <artifactItem>
- <groupId>org.openoffice</groupId>
- <artifactId>odfdom</artifactId>
- <version>0.6.16</version>
- </artifactItem>
-
- <artifactItem>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
- </artifactItem>
-
- <artifactItem>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
Modified: directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java?rev=1647196&r1=1647195&r2=1647196&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java (original)
+++ directory/studio/branches/studio-tycho/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java Sun Dec 21 19:28:55 2014
@@ -42,6 +42,7 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
import org.eclipse.core.runtime.Preferences;
+/*
import org.openoffice.odf.doc.OdfFileDom;
import org.openoffice.odf.doc.OdfSpreadsheetDocument;
import org.openoffice.odf.doc.element.table.OdfTable;
@@ -49,6 +50,7 @@ import org.openoffice.odf.doc.element.ta
import org.openoffice.odf.doc.element.table.OdfTableRow;
import org.openoffice.odf.dom.OdfNamespace;
import org.openoffice.odf.dom.type.office.OdfValueType;
+*/
import org.w3c.dom.Element;
@@ -136,6 +138,7 @@ public class ExportOdfRunnable implement
*/
public void run( StudioProgressMonitor monitor )
{
+ /*
monitor.beginTask( BrowserCoreMessages.jobs__export_odf_task, 2 );
monitor.reportProgress( " " ); //$NON-NLS-1$
monitor.worked( 1 );
@@ -194,6 +197,7 @@ public class ExportOdfRunnable implement
{
monitor.reportError( e );
}
+ */
}
@@ -214,6 +218,7 @@ public class ExportOdfRunnable implement
*
* @throws IOException Signals that an I/O exception has occurred.
*/
+/*
private static void exportToOdf( IBrowserConnection browserConnection, SearchParameter searchParameter,
OdfFileDom contentDoc, OdfTable table, OdfTableRow headerRow, int count, StudioProgressMonitor monitor,
LinkedHashMap<String, Short> attributeNameMap, String valueDelimiter, int binaryEncoding, boolean exportDn )
@@ -257,6 +262,7 @@ public class ExportOdfRunnable implement
monitor.reportError( e );
}
}
+*/
/**
@@ -272,6 +278,7 @@ public class ExportOdfRunnable implement
* @param binaryEncoding the binary encoding
* @param exportDn the export dn
*/
+/*
private static void recordToOdfRow( IBrowserConnection browserConnection, LdifContentRecord record,
OdfFileDom contentDoc, OdfTable table, OdfTableRow headerRow, Map<String, Short> headerRowAttributeNameMap,
String valueDelimiter, int binaryEncoding, boolean exportDn )
@@ -319,4 +326,6 @@ public class ExportOdfRunnable implement
row.appendCell( cell );
}
}
+*/
+
}