diff --git a/pom.xml b/pom.xml
index c866929..4d1a8ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
configuration
network
security
- sharepoint
+ sharepoint
util
jeeutil
@@ -37,10 +37,15 @@
- log4j
- log4j
- 1.2.17
-
+ org.apache.logging.log4j
+ log4j-api
+ 2.3
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.3
+
javax.mail
diff --git a/sharepoint/api/pom.xml b/sharepoint/api/pom.xml
index a56d5df..c3c7edd 100644
--- a/sharepoint/api/pom.xml
+++ b/sharepoint/api/pom.xml
@@ -269,8 +269,12 @@
${project.version}
- log4j
- log4j
-
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.apache.logging.log4j
+ log4j-api
+
\ No newline at end of file
diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPJaxbObject.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPJaxbObject.java
index d3e2924..b5f35ac 100644
--- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPJaxbObject.java
+++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPJaxbObject.java
@@ -14,7 +14,8 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
@@ -26,7 +27,7 @@ import org.xml.sax.SAXException;
public abstract class SPJaxbObject extends AbstractSpJaxbObject {
/** the logging object. */
- private final static Logger LOGGER = Logger.getLogger(SPJaxbObject.class);
+ private final static Logger LOGGER = LogManager.getLogger(SPJaxbObject.class);
/**
* list of packages to search in
diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPValidationEventHandler.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPValidationEventHandler.java
index 33c2019..a1886ed 100644
--- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPValidationEventHandler.java
+++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPValidationEventHandler.java
@@ -2,7 +2,9 @@ package de.muehlencord.shared.sharepoint.api;
import javax.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
/**
*
@@ -10,7 +12,7 @@ import org.apache.log4j.Logger;
*/
public class SPValidationEventHandler implements ValidationEventHandler {
- private final static Logger LOGGER = Logger.getLogger(SPValidationEventHandler.class);
+ private final static Logger LOGGER = LogManager.getLogger(SPValidationEventHandler.class);
@Override
public boolean handleEvent(ValidationEvent event) {
diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
index 3ccbffc..0735159 100644
--- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
+++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
@@ -9,7 +9,9 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPHandler;
import javax.xml.ws.handler.soap.SOAPMessageContext;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+;
/**
*
@@ -18,7 +20,7 @@ import org.apache.log4j.Logger;
public class ServiceLogHandler implements SOAPHandler {
/** the logging object. */
- private final static Logger LOGGER = Logger.getLogger(ServiceLogHandler.class);
+ private final static Logger LOGGER = LogManager.getLogger(ServiceLogHandler.class);
@Override
public Set getHeaders() {
diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/camlquery/SPCamlQuery.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/camlquery/SPCamlQuery.java
new file mode 100644
index 0000000..b222599
--- /dev/null
+++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/camlquery/SPCamlQuery.java
@@ -0,0 +1,32 @@
+package de.muehlencord.shared.sharepoint.api.camlquery;
+
+/**
+ *
+ * @author joern.muehlencord
+ */
+public class SPCamlQuery {
+
+
+/*extends SPJaxbObject {
+
+ public SPCamlQuery(SPContext context) throws JAXBException {
+ super(CamlQueryRoot.class, context);
+ }
+
+
+ @Override
+ protected java.util.List getSchemaLocation() {
+ java.util.List schemaList = new ArrayList();
+ schemaList.add("/xsd/camlquery.xsd");
+ schemaList.add("/xsd/coredefinitions.xsd");
+ return schemaList;
+ }
+*/
+}
+
+/**
+ * History:
+ *
+ * $$Log$$
+ *
+ */
diff --git a/sharepoint/api/src/main/resources/jaxb/camlquery.xml b/sharepoint/api/src/main/resources/jaxb/camlquery.xml
new file mode 100644
index 0000000..1152714
--- /dev/null
+++ b/sharepoint/api/src/main/resources/jaxb/camlquery.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sharepoint/api/src/main/resources/xsd/camlquery.xsd b/sharepoint/api/src/main/resources/xsd/camlquery.xsd
new file mode 100644
index 0000000..04b1037
--- /dev/null
+++ b/sharepoint/api/src/main/resources/xsd/camlquery.xsd
@@ -0,0 +1,351 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sharepoint/api/src/main/resources/xsd/coredefinitions.xsd b/sharepoint/api/src/main/resources/xsd/coredefinitions.xsd
new file mode 100644
index 0000000..e9fa0e0
--- /dev/null
+++ b/sharepoint/api/src/main/resources/xsd/coredefinitions.xsd
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sharepoint/api/src/test/java/de/muehlencord/shared/sharepoint/api/BaseTest.java b/sharepoint/api/src/test/java/de/muehlencord/shared/sharepoint/api/BaseTest.java
index b707a1c..35e21ec 100644
--- a/sharepoint/api/src/test/java/de/muehlencord/shared/sharepoint/api/BaseTest.java
+++ b/sharepoint/api/src/test/java/de/muehlencord/shared/sharepoint/api/BaseTest.java
@@ -18,14 +18,18 @@ import org.junit.Before;
* @author jomu
*/
public class BaseTest {
-
+
protected SPContext context = null;
@Before
public void init() throws MalformedURLException, NoSuchAlgorithmException, KeyManagementException, JAXBException {
// FIXME - needs to be implemented using mock; replace with real data but make sure password is not commited
NtlmAuthenticator credentials = null;
- context = null;
+ context = null;
+ // DO NOT COMMMT THE FOLLOWING LINES
+ credentials = new NtlmAuthenticator("wincor-nixdorf.com", "joern.muehlencord", "\"34fR4vbHuL");
+ context = new SPContext(new java.net.URL("https://troom.wincor-nixdorf.com/rooms/sw_ps_hq_utrecht/hqall/bd/spwin7/"), credentials, SPVersion.SP2010,
+ true);
}
/**
diff --git a/sharepoint/api/src/test/resources/de/muehlencord/shared/sharepoint/api/camlquery/basicquery.xml b/sharepoint/api/src/test/resources/de/muehlencord/shared/sharepoint/api/camlquery/basicquery.xml
new file mode 100644
index 0000000..bf9007e
--- /dev/null
+++ b/sharepoint/api/src/test/resources/de/muehlencord/shared/sharepoint/api/camlquery/basicquery.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+ Chandler
+
+
+
+ AuditDeleteTesting
+
+
+
+
+ 2013-09-11
+
+
+
+
+
\ No newline at end of file