Author: apaliwal
Date: Tue Apr 21 08:51:27 2009
New Revision: 767076
URL: http://svn.apache.org/viewvc?rev=767076&view=rev
Log:
Updated Header and added Date and Rev as per MINA header. Updated mina and
storage packages
Submitted By: Ashish Paliwal (apaliwal.at.apache.org)
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/MinaBackedSessionContext.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriteInfo.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorage.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorageException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/roster/JcrRosterManager.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/user/JcrUserManagement.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/vcardtemp/JcrVcardTempPersistenceManager.java
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/MinaBackedSessionContext.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/MinaBackedSessionContext.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/MinaBackedSessionContext.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/MinaBackedSessionContext.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.mina;
import org.apache.mina.common.IoSession;
@@ -34,6 +37,9 @@
/**
* connects MINA frontend to the vysper backend
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class MinaBackedSessionContext extends AbstractSessionContext
implements StanzaWriter, IoFutureListener {
@@ -45,7 +51,7 @@
protected CloseFuture closeFuture;
public MinaBackedSessionContext(
- ServerRuntimeContext serverRuntimeContext,
+ ServerRuntimeContext serverRuntimeContext,
SessionStateHolder sessionStateHolder,
IoSession minaSession) {
super(serverRuntimeContext, sessionStateHolder);
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/TCPEndpoint.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
(original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.mina;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
@@ -30,6 +33,9 @@
import java.net.InetSocketAddress;
/**
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class TCPEndpoint implements Endpoint {
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.mina;
import org.apache.mina.common.IdleStatus;
@@ -29,17 +32,19 @@
import org.slf4j.LoggerFactory;
/**
- *
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class XmppIoHandlerAdapter implements IoHandler {
-
+
public static final String ATTRIBUTE_VYSPER_SESSION = "vysperSession";
public static final String ATTRIBUTE_VYSPER_SESSIONSTATEHOLDER =
"vysperSessionStateHolder";
final Logger logger = LoggerFactory.getLogger(XmppIoHandlerAdapter.class);
-
+
private ServerRuntimeContext serverRuntimeContext;
-
+
public void setServerRuntimeContext(ServerRuntimeContext
serverRuntimeContext) {
this.serverRuntimeContext = serverRuntimeContext;
}
@@ -49,9 +54,9 @@
if (message instanceof XMLText) {
String text = ((XMLText) message).getText();
// tolerate reasonable amount of whitespaces for stanza
separation
- if (text.length() < 40 && text.trim().length() == 0) return;
+ if (text.length() < 40 && text.trim().length() == 0) return;
}
-
+
messageReceivedNoStanza(ioSession, message);
return;
}
@@ -72,7 +77,7 @@
} else if (message == SSLFilter.SESSION_UNSECURED) {
// TODO
return;
-// throw new IllegalStateException("server must close session!");
+// throw new IllegalStateException("server must close session!");
}
throw new IllegalArgumentException("xmpp handler only accepts
Stanza-typed messages");
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriteInfo.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriteInfo.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriteInfo.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriteInfo.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.mina.codec;
import org.apache.vysper.xmpp.stanza.Stanza;
@@ -22,6 +25,9 @@
/**
* a stanza plus the flags indicating which parts of the stanza are actually
to be written.
* this is especially useful when opening the stream, where the opening tag is
never/not immediately closed.
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class StanzaWriteInfo {
private Stanza stanza = null;
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.mina.codec;
import org.apache.mina.common.ByteBuffer;
@@ -32,6 +35,9 @@
/**
* connects MINA low level protocol and session stanza writer
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class StanzaWriterProtocolEncoder implements ProtocolEncoder {
@@ -60,11 +66,11 @@
}
public void dispose(IoSession ioSession) throws Exception {
- logger.warn("unhandled StanzaWriterProtocolEncoder.dispose()");
+ logger.warn("unhandled StanzaWriterProtocolEncoder.dispose()");
}
public CharsetEncoder getSessionEncoder() {
return CharsetUtil.UTF8_ENCODER;
}
-
+
}
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.mina.codec;
import org.apache.mina.common.ByteBuffer;
@@ -35,10 +38,13 @@
import java.util.List;
/**
- * splits xml stream into handy tokens for further processing
+ * splits xml stream into handy tokens for further processing
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class XMLStreamTokenizer extends CumulativeProtocolDecoder {
-
+
public static final String SESSION_ATTRIBUTE_NAME =
"tokenizerParticleList";
private static final XMLRawToFragmentConverter CONVERTER = new
XMLRawToFragmentConverter();
@@ -50,7 +56,7 @@
XMLParticle xmlParticle = ParticleDecoder.decodeParticle(byteBuffer,
CharsetUtil.UTF8_DECODER);
if (xmlParticle != null) {
- // new particle is completed
+ // new particle is completed
// get current list from session
List<XMLParticle> particles = (List<XMLParticle>)
ioSession.getAttribute(SESSION_ATTRIBUTE_NAME);
if (particles == null) {
@@ -61,14 +67,14 @@
// add to list of particles
particles.add(xmlParticle);
- // only if the list is balanced, a new stanza is completed
+ // only if the list is balanced, a new stanza is completed
try {
if (CONVERTER.isBalanced(particles)) {
// reset session list
ioSession.setAttribute(SESSION_ATTRIBUTE_NAME, new
ArrayList<XMLParticle>());
-
+
XMLFragment xmlFragment = CONVERTER.convert(particles);
-
+
if (xmlFragment instanceof XMLElement) {
// propagate element
@@ -78,14 +84,14 @@
} else {
// TODO handle text elements properly might be only
whitespaces/newlines
protocolDecoderOutput.write(xmlFragment);
- }
+ }
}
} catch (DecodingException e) {
throw e; // rethrow
}
}
-
+
return xmlParticle != null;
}
}
\ No newline at end of file
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.mina.codec;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
@@ -22,6 +25,9 @@
/**
* factory class for Vysper-specific encoder and decoder
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class XMPPProtocolCodecFactory implements ProtocolCodecFactory {
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorage.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorage.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorage.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorage.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2008 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.storage.jcr;
import org.apache.jackrabbit.core.TransientRepository;
@@ -25,6 +28,8 @@
/**
* back-end stuff for JCR, used by the semantic specific adapters
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class JcrStorage {
@@ -45,7 +50,7 @@
}
protected Session session = null;
-
+
public Session getRepositorySession() throws JcrStorageException {
if (session != null) return session;
try {
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorageException.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorageException.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorageException.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/JcrStorageException.java
Tue Apr 21 08:51:27 2009
@@ -1,22 +1,27 @@
-/***********************************************************************
- * Copyright (c) 2006-2008 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.storage.jcr;
/**
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class JcrStorageException extends Exception {
public JcrStorageException() {
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/roster/JcrRosterManager.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/roster/JcrRosterManager.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/roster/JcrRosterManager.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/roster/JcrRosterManager.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.storage.jcr.roster;
import org.apache.vysper.storage.jcr.JcrStorage;
@@ -44,12 +47,15 @@
* roster items are stored for contacts in the following path:
* /accountentity/[email protected]/jabber_iq_roster/[email protected]
* all item properties besides contact jid (which is used as a node name)
- * are stored as node properties
+ * are stored as node properties
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class JcrRosterManager extends AbstractRosterManager {
final Logger logger = LoggerFactory.getLogger(JcrRosterManager.class);
-
+
protected JcrStorage jcrStorage;
public JcrRosterManager(JcrStorage jcrStorage) {
@@ -68,9 +74,9 @@
@Override
protected Roster retrieveRosterInternal(Entity bareJid) {
final Node rosterNode = retrieveRosterNode(jcrStorage, bareJid);
-
+
MutableRoster roster = new MutableRoster();
-
+
NodeIterator nodes = null;
try {
nodes = rosterNode.getNodes();
@@ -145,10 +151,10 @@
@Override
public void addContact(Entity jid, RosterItem rosterItem) throws
RosterException {
if (jid == null) throw new RosterException("jid not provided");
- if (rosterItem.getJid() == null) throw new RosterException("contact
jid not provided");
+ if (rosterItem.getJid() == null) throw new RosterException("contact
jid not provided");
// TODO think about concurrent updates
-
+
Entity contactJid = rosterItem.getJid().getBareJID();
Node contactNode = getOrCreateContactNode(jid, contactJid);
try {
@@ -156,7 +162,7 @@
String subscriptionTypeValue = rosterItem.getSubscriptionType() ==
null ? null : rosterItem.getSubscriptionType().value();
setOrRemoveAttribute(contactNode, "type", subscriptionTypeValue);
String askSubscriptionTypeValue = null;
- if (rosterItem.getAskSubscriptionType() != null &&
+ if (rosterItem.getAskSubscriptionType() != null &&
rosterItem.getAskSubscriptionType() !=
AskSubscriptionType.NOT_SET) {
askSubscriptionTypeValue =
rosterItem.getAskSubscriptionType().value();
}
@@ -191,7 +197,7 @@
} catch (RepositoryException addNodeEx) {
throw new RosterException("failed to add contact node to
roster for user = " + jid.getFullQualifiedName() + " and contact jid = " +
contactJid.getFullQualifiedName(), addNodeEx);
}
-
+
}
return contactNode;
}
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/user/JcrUserManagement.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/user/JcrUserManagement.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/user/JcrUserManagement.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/user/JcrUserManagement.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2008 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.storage.jcr.user;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -32,11 +35,14 @@
import javax.jcr.Property;
/**
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class JcrUserManagement implements UserAuthorization,
AccountVerification, AccountCreation {
final Logger logger = LoggerFactory.getLogger(JcrUserManagement.class);
-
+
protected JcrStorage jcrStorage;
private static final String CREDENTIALS_NAMESPACE =
"vysper_internal_credentials";
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/vcardtemp/JcrVcardTempPersistenceManager.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/vcardtemp/JcrVcardTempPersistenceManager.java?rev=767076&r1=767075&r2=767076&view=diff
==============================================================================
---
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/vcardtemp/JcrVcardTempPersistenceManager.java
(original)
+++
mina/sandbox/vysper/src/main/java/org/apache/vysper/storage/jcr/vcardtemp/JcrVcardTempPersistenceManager.java
Tue Apr 21 08:51:27 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.
+ *
+ */
package org.apache.vysper.storage.jcr.vcardtemp;
import org.apache.vysper.storage.jcr.JcrStorage;
@@ -29,13 +32,16 @@
import javax.jcr.RepositoryException;
/**
+ *
+ * @author The Apache MINA Project ([email protected])
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class JcrVcardTempPersistenceManager implements
VcardTempPersistenceManager {
final Logger logger =
LoggerFactory.getLogger(JcrVcardTempPersistenceManager.class);
protected JcrStorage jcrStorage;
-
+
public JcrVcardTempPersistenceManager(JcrStorage jcrStorage) {
this.jcrStorage = jcrStorage;
}
