Skip to content

Commit

Permalink
#13482 nocode now with more tika
Browse files Browse the repository at this point in the history
  • Loading branch information
wezell committed Jan 29, 2018
2 parents f7bf9b0 + 415e2e7 commit ada65e6
Show file tree
Hide file tree
Showing 563 changed files with 3,996 additions and 4,102 deletions.
13 changes: 12 additions & 1 deletion dotCMS/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,22 @@ eclipse.project {

dependencies {
/***** Felix libs need to be placed in the WEB-INF/felix/bundle directory. This was previously handled using a pre-build copy task. *****/
felix group: 'org.apache.felix', name: 'org.apache.felix.bundlerepository', version:'2.0.8'
felix (group: 'org.apache.felix', name: 'org.apache.felix.bundlerepository', version:'2.0.8') {
exclude(group: 'org.easymock')
}
felix group: 'org.apache.felix', name: 'org.apache.felix.fileinstall', version:'3.5.8'
felix group: 'org.apache.felix', name: 'org.apache.felix.gogo.command', version:'1.0.2'
felix group: 'org.apache.felix', name: 'org.apache.felix.gogo.runtime', version:'1.0.2'
felix group: 'org.apache.felix', name: 'org.apache.felix.gogo.shell', version:'1.0.0'
felix (group: 'org.apache.tika', name: 'tika-core', version: '1.17'){
transitive = false
}
felix (group: 'org.apache.tika', name: 'tika-bundle', version: '1.17'){
transitive = false
}
felix group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.24'
felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
felix group: 'com.dotcms.tika', name: 'com.dotcms.tika', version: '0.1'

/**** And now the libs we pull in from internal company sources - libs stored in ./plugins, ./bin, ./libs, the starter site, etc. ****/
compile fileTree("src/main/plugins/com.dotcms.config/build/jar").include('plugin-com.dotcms.config.jar')
Expand Down
152 changes: 110 additions & 42 deletions dotCMS/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,28 @@ dependencies {
compile group: 'com.dotcms.lib', name: 'dot.cactus.integration.ant', version:'1.8.0_2'
compile group: 'com.dotcms.lib', name: 'dot.cargo-ant', version:'0.9_2'
compile group: 'com.dotcms.lib', name: 'dot.cargo-core-uberjar', version:'0.9_2'
compile group: 'com.dotcms.lib', name: 'dot.castor', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.cglib-nodep', version:'2.2_2'
compile group: 'com.dotcms.lib', name: 'dot.com.dotmarketing.jhlabs.images.filters', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-beanutils', version:'1.6.1_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-cli', version:'1.2_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-collections', version:'3.2_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-configuration', version:'1.0_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-dbcp', version:'1.3_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-digester', version:'1.7_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-fileupload', version:'1.2_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-httpclient', version:'3.1_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-io', version:'2.0.1_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-jci-core', version:'1.0.406301_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-jci-eclipse', version:'3.2.0.666_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-lang', version:'2.4_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-net', version:'3.3_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-pool', version:'1.5.4_2'
compile group: 'com.dotcms.lib', name: 'dot.commons-validator', version:'1.1.3_2'
compile group: 'com.dotcms.lib', name: 'dot.compression-filter', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.concurrent', version:'1.3.4_2'
compile group: 'com.dotcms.lib', name: 'dot.core-renderer-modified', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.cos', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.counter-ejb', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.counter-ejb', version:'ukv_3'
compile group: 'com.dotcms.lib', name: 'dot.daisydiff', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.dnsjava', version:'2.0.8_2'
compile group: 'com.dotcms.lib', name: 'dot.drools-compiler', version:'3.0.5_2'
compile group: 'com.dotcms.lib', name: 'dot.drools-core', version:'3.0.5_2'
compile group: 'com.dotcms.lib', name: 'dot.drools-decisiontables', version:'3.0.5_2'
compile group: 'com.dotcms.lib', name: 'dot.drools-jsr94', version:'3.0.5_2'
compile group: 'com.dotcms.lib', name: 'dot.dwr', version:'3rc2modified_2'
compile group: 'com.dotcms.lib', name: 'dot.dwr', version:'3rc2modified_3'
compile group: 'com.dotcms.lib', name: 'dot.elasticsearch', version:'1.7.3_1'
compile group: 'com.dotcms.lib', name: 'dot.fileupload-ext', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.fop', version:'0.20.1_3'
Expand All @@ -67,7 +59,6 @@ dependencies {
compile group: 'com.dotcms.lib', name: 'dot.hadoop-dev-core', version:'0.20.3_2'
compile group: 'com.dotcms.lib', name: 'dot.hadoop-dev-tools', version:'0.20.3_2'
compile group: 'com.hazelcast', name: 'hazelcast-all', version: '3.9.2'
compile group: 'com.dotcms.lib', name: 'dot.hibernate', version:'2.1.7_2'
compile group: 'com.dotcms.lib', name: 'dot.httpbridge', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.httpclient', version:'4.2.2_2'
compile group: 'com.dotcms.lib', name: 'dot.httpcore', version:'4.2.2_2'
Expand Down Expand Up @@ -95,19 +86,18 @@ dependencies {
compile group: 'com.dotcms.lib', name: 'dot.jcaptcha-mod', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.jempbox', version:'1.6.0_2'
compile group: 'com.dotcms.lib', name: 'dot.jep', version:'2.4.1_2'
compile group: 'com.dotcms.lib', name: 'dot.jersey-client', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-common', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet-core', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-guava', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-media-jaxb', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-media-multipart', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-media-json-jackson', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-server', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-entity-filtering', version:'2.22.1_1'
compile group: 'com.dotcms.lib', name: 'dot.jersey-client', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-common', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet-core', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-container-servlet', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-guava', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-media-jaxb', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-media-multipart', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-media-json-jackson', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-server', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jersey-entity-filtering', version:'2.22.1_4'
compile group: 'com.dotcms.lib', name: 'dot.jettison', version:'1.1_2'
compile group: 'com.dotcms.lib', name: 'dot.jfreechart', version:'1.0.13_2'
compile group: 'com.dotcms.lib', name: 'dot.jgroups', version:'3.6.1.Final_2'
compile group: 'com.dotcms.lib', name: 'dot.jid3lib', version:'0.5.4_2'
compile group: 'com.dotcms.lib', name: 'dot.JLinkPointTxn', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.json-jspellchecker-dep', version:'ukv_2'
Expand All @@ -119,11 +109,10 @@ dependencies {
compile group: 'com.dotcms.lib', name: 'dot.jython', version:'2.2.1_2'
compile group: 'com.dotcms.lib', name: 'dot.ldap', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.lesscss', version:'1.5.1-SNAPSHOT_3'
compile group: 'com.dotcms.lib', name: 'dot.log4j-1.2-api', version:'2.3_1'
compile group: 'com.dotcms.lib', name: 'dot.log4j-api', version:'2.3_1'
compile group: 'com.dotcms.lib', name: 'dot.log4j-core', version:'2.3_2'
compile group: 'com.dotcms.lib', name: 'dot.log4j-jcl', version:'2.3_1'
compile group: 'com.dotcms.lib', name: 'dot.log4j-web', version:'2.3_2'
compile group: 'com.dotcms.lib', name: 'dot.log4j-api', version:'2.3_2'
compile group: 'com.dotcms.lib', name: 'dot.log4j-core', version:'2.3_3'
compile group: 'com.dotcms.lib', name: 'dot.log4j-jcl', version:'2.3_2'
compile group: 'com.dotcms.lib', name: 'dot.log4j-web', version:'2.3_3'
compile group: 'com.dotcms.lib', name: 'dot.lucene-analyzers-common', version:'4.10.4_1'
compile group: 'com.dotcms.lib', name: 'dot.lucene-core', version:'4.10.4_1'
compile group: 'com.dotcms.lib', name: 'dot.lucene-expressions', version:'4.10.4_1'
Expand All @@ -149,48 +138,127 @@ dependencies {
compile group: 'com.dotcms.lib', name: 'dot.org.eclipse.mylyn.wikitext.textile.core', version:'1.8.0.I20120918-1109_2'
compile group: 'com.dotcms.lib', name: 'dot.org.eclipse.mylyn.wikitext.tracwiki.core', version:'1.8.0.I20120918-1109_2'
compile group: 'com.dotcms.lib', name: 'dot.org.eclipse.mylyn.wikitext.twiki.core', version:'1.8.0.I20120918-1109_2'
compile group: 'com.dotcms.lib', name: 'dot.oro', version:'2.0.8_2'
compile group: 'com.dotcms.lib', name: 'dot.platform', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.portlet', version:'1.0_2'
compile group: 'com.dotcms.lib', name: 'dot.quartz-all', version:'1.8.6_2'
compile group: 'com.dotcms.lib', name: 'dot.rhino', version:'1.7R4_2'
compile group: 'com.dotcms.lib', name: 'dot.secure-filter', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.simplecaptcha', version:'1.2.1_2'
compile group: 'com.dotcms.lib', name: 'dot.snappy-java', version:'1.0.4.1_2'
compile group: 'com.dotcms.lib', name: 'dot.sslext', version:'1.2_2'
compile group: 'com.dotcms.lib', name: 'dot.stax2-api', version:'3.1.1_2'
compile group: 'com.dotcms.lib', name: 'dot.struts', version:'1.2.4_2'
compile group: 'com.dotcms.lib', name: 'dot.stxx', version:'1.3_2'
compile group: 'com.dotcms.lib', name: 'dot.tagsoup', version:'1.2_2'
compile group: 'com.dotcms.lib', name: 'dot.Tidy', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.trove', version:'1.0.2_2'
compile group: 'com.dotcms.lib', name: 'dot.twitter4j-core', version:'3.0.3_2'
compile group: 'com.dotcms.lib', name: 'dot.urlrewritefilter', version:'4.0.3_2'
compile group: 'com.dotcms.lib', name: 'dot.util-taglib', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.Verisign', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.wbmp', version:'ukv_2'
compile group: 'com.dotcms.lib', name: 'dot.werken-xpath', version:'0.9.4_2'
compile group: 'com.dotcms.lib', name: 'dot.woodstox-core-lgpl', version:'4.2.0_2'
compile group: 'com.dotcms.lib', name: 'dot.xalan', version:'2.7.0_2'
compile group: 'com.dotcms.lib', name: 'dot.xmlpull', version:'1.1.3.1_2'
compile group: 'com.dotcms.lib', name: 'dot.xpp3-min', version:'1.1.4c_2'
compile group: 'com.dotcms.lib', name: 'dot.xstream', version:'1.4.8_2'
compile group: 'com.dotcms.lib', name: 'dot.slf4j-api', version:'1.7.12_2'
compile group: 'com.dotcms.lib', name: 'dot.slf4j-jcl', version:'1.7.12_2'
compile group: 'com.dotcms.lib', name: 'dot.tika-app', version:'1.3_3'
compile (group: 'xerces', name: 'xercesImpl', version: '2.11.0'){
transitive = false
}
compile (group: 'org.apache.commons', name: 'commons-compress', version: '1.15'){
transitive = false
}
compile (group: 'commons-digester', name: 'commons-digester', version: '2.1'){
transitive = false
}
compile (group: 'commons-validator', name: 'commons-validator', version: '1.6'){
transitive = false
}
compile (group: 'commons-collections', name: 'commons-collections', version: '3.2.2'){
transitive = false
}
compile (group: 'commons-configuration', name: 'commons-configuration', version: '1.10'){
transitive = false
}
compile (group: 'commons-lang', name: 'commons-lang', version: '2.6'){
transitive = false
}
compile (group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'){
transitive = false
}
compile (group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'){
transitive = false
}
compile (group: 'org.jdom', name: 'jdom', version: '1.1.3'){
transitive = false
}
compile (group: 'dom4j', name: 'dom4j', version: '1.6.1'){
transitive = false
}
compile (group: 'org.apache.poi', name: 'poi', version: '3.17'){
transitive = false
}
compile (group: 'com.googlecode.juniversalchardet', name: 'juniversalchardet', version: '1.0.3'){
transitive = false
}
compile (group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'){
transitive = false
}
compile (group: 'org.codehaus.castor', name: 'castor-core', version: '1.4.1'){
transitive = false
}
compile (group: 'org.codehaus.castor', name: 'castor-xml', version: '1.4.1'){
transitive = false
}
compile (group: 'werken-xpath', name: 'werken-xpath', version: '0.9.4'){
transitive = false
}
compile (group: 'org.jgroups', name: 'jgroups', version: '3.6.1.Final'){
transitive = false
}
compile (group: 'org.tuckey', name: 'urlrewritefilter', version: '4.0.4'){
transitive = false
}
compile (group: 'struts', name: 'struts', version: '1.2.4'){
transitive = false
}
compile (group: 'stxx', name: 'stxx', version: '1.3'){
transitive = false
}
compile (group: 'oro', name: 'oro', version: '2.0.8'){
transitive = false
}
compile (group: 'sslext', name: 'sslext', version: '1.2-0'){
transitive = false
}
compile (group: 'hibernate', name: 'hibernate', version: '2.1.7c'){
transitive = false
}
compile (group: 'cglib', name: 'cglib-nodep', version: '3.2.6'){
transitive = false
}
compile (group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10'){
transitive = false
}
compile (group: 'xmlpull', name: 'xmlpull', version: '1.1.3.1'){
transitive = false
}
compile (group: 'org.glassfish.hk2', name: 'hk2-locator', version: '2.4.0'){
transitive = false
}
compile (group: 'org.glassfish.hk2', name: 'hk2-utils', version: '2.4.0'){
transitive = false
}
compile (group: 'org.glassfish.hk2', name: 'hk2-api', version: '2.4.0'){
transitive = false
}
compile (group: 'org.glassfish.hk2.external', name: 'javax.inject', version: '2.4.0-b10'){
transitive = false
}

compile group: 'redis.clients', name: 'jedis', version:'2.7.3'
compile group: 'org.apache.commons', name: 'commons-pool2', version:'2.0'
compile group: 'com.dotcms.lib', name: 'dot.maxmind-db', version:'1.0.0_2'

compile group: 'org.openjdk.jmh', name: 'jmh-core', version:'0.1'
compile group: 'com.dotcms.lib', name: 'dot.geoip2', version:'2.1.0_2'
compile group: 'com.dotcms.lib', name: 'dot.aopalliance-repackaged', version:'2.4.0-b10_2'
compile group: 'com.dotcms.lib', name: 'dot.hk2-api', version:'2.4.0-b10_2'
compile group: 'com.dotcms.lib', name: 'dot.hk2-locator', version:'2.4.0-b10_2'
compile group: 'com.dotcms.lib', name: 'dot.hk2-utils', version:'2.4.0-b10_2'
compile group: 'com.dotcms.lib', name: 'dot.javassist', version:'3.18.1-GA_2'
compile group: 'com.dotcms.lib', name: 'dot.javax.annotation-api', version:'1.2_2'
compile group: 'com.dotcms.lib', name: 'dot.javax.inject', version:'2.4.0-b10_2'
compile group: 'com.dotcms.lib', name: 'dot.javax.ws.rs-api', version:'2.0.1_2'
compile group: 'com.dotcms.lib', name: 'dot.persistence-api', version:'1.0_2'
compile group: 'com.dotcms.lib', name: 'dot.validation-api', version:'1.1.0.Final_2'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package com.dotmarketing.listeners;

import com.dotcms.repackage.org.dom4j.Document;
import com.dotcms.repackage.org.dom4j.DocumentHelper;
import com.dotcms.repackage.org.dom4j.Element;
import com.dotcms.repackage.org.dom4j.io.OutputFormat;
import com.dotcms.repackage.org.dom4j.io.XMLWriter;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileWriter;
Expand All @@ -20,6 +15,11 @@
import java.util.Date;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletResponse;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.junit.runner.Description;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.dotcms;

import com.dotcms.repackage.net.sf.hibernate.HibernateException;
import com.dotmarketing.beans.Host;
import com.dotmarketing.business.APILocator;
import com.dotmarketing.business.Role;
Expand All @@ -24,6 +23,7 @@
import java.io.UnsupportedEncodingException;
import java.sql.SQLException;
import java.util.List;
import net.sf.hibernate.HibernateException;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Assert;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.dotcms.contenttype.model.type.ContentTypeBuilder;
import com.dotcms.contenttype.model.type.Expireable;
import com.dotcms.contenttype.model.type.UrlMapable;
import com.dotcms.repackage.org.apache.commons.lang.StringUtils;
import com.dotmarketing.beans.Host;
import com.dotmarketing.business.APILocator;
import com.dotmarketing.exception.DotDataException;
Expand All @@ -31,6 +30,7 @@
import java.util.Date;
import java.util.List;
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
import org.junit.Assert;
import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
package com.dotcms.contenttype.test;

import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import org.junit.Assert;
import org.junit.Test;

import com.dotcms.contenttype.model.field.Field;
import com.dotcms.contenttype.model.field.ImmutableBinaryField;
import com.dotcms.contenttype.model.field.ImmutableCategoryField;
Expand Down Expand Up @@ -39,7 +31,6 @@
import com.dotcms.contenttype.model.type.ContentTypeBuilder;
import com.dotcms.contenttype.model.type.SimpleContentType;
import com.dotcms.contenttype.transform.field.LegacyFieldTransformer;
import com.dotcms.repackage.org.apache.commons.lang.StringUtils;
import com.dotcms.util.CollectionsUtils;
import com.dotmarketing.beans.Host;
import com.dotmarketing.business.APILocator;
Expand All @@ -49,6 +40,12 @@
import com.dotmarketing.portlets.contentlet.model.Contentlet;
import com.dotmarketing.quartz.job.DeleteFieldJob;
import com.dotmarketing.quartz.job.TestJobExecutor;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.junit.Assert;
import org.junit.Test;

/**
*
Expand Down
Loading

0 comments on commit ada65e6

Please sign in to comment.